Reform smart

Reform smart by Condition