refactoring messageManager use, reusing more code now