new thinking: only one form for the rooms

removed extra rooms