Changed notification check back to hook