Johnathan's two place Rebuild