Use the global messaging system
Cleaned up code