3D house tweaks
Merged conflicts