Made room generation better