Notifications Fix Final