working on getting notifications to work better