added Condition w/ Expressions