few changes to allow us to show/hide some messages