Room2 model adjustments

Better room 2 model