Overhaul for the 3D client