slight changes to the conditional code