modified waiting/leaving stops procedure to show notifications to users