bugg fix and notification example