TSAGE: R2R - more refactoring in scene group 1