changes to conditional code