code changes for notifications and connections...