added some extra functionality to conditions/where