completely moved pbch etc. to 3.7