added Room and changes to fit new game content