added proxy scene and other changes