Rethink room setup