further changes to refine notifications