Stonewall smart

Stonewall smart by Condition