Rewirte task system, add step machenism