reorganised bayesactself so things are in the right places