Refactored Scene