more work on scene managment