Making notifications work better