added notify but needs to be fixed