Updated scene, now with room switching