more changes to address notification