message refactor
room refactor