Switch to a room based system