small changes
Merge branch 'message_center' into testing