better logic for future notifications