need to double check notify functions