changed addWhere to setConditional