refactored.. more in scene