Changes for tap and exit message