Reorginized room code