changed Condition implementation