Commenting out other should_notify