Consolidated solution. Refactored messaging