temp - needs to be reviewed for conjunctive vs disjunctive changes