added notify, changed stuff