Did some work in Condition.h