Added rooms + other changes.