Improved Condition implementation   ... probably