need to switch back to master
fix for merge with master
change condition to string, update condition
redo condition change because forgot to add
changed condition select menu