added message shown handling