Refactored code to accommodate for new Scene class