Updated to fix notifications