Change Condition as well as comments