Update with optimized format_step