renamed scene to prevent merge conflicts