Some modifications in Play motion and enter_room