major changes

update notification testing required