Updated the conditional constructs