Refactored scenes