Changed the way we deal with scenes.