RoomState a bit better
merge conflict