M., Neil, and M.'s cafe manager are now staying in the cafe quarters, along with Chin, Michael, and Dennis.

I like this arrangement. The cafe is safer that way.