Comment and condition updated