refactored to simplify structure of scenes