added ability to show custom mesage