merge in changes from BAA