merged
added "Condition"