changes to 'or' and 'and'