Added condition evaluation