lock Notification function and fix grammars