Decoupled buildings/rooms a little