refactor scene selection phase 2