remove notify from here