Adding Finish Condition