pull John stuff
fix conflict w John