refactoring due to scene holder introduction