Improve step processing
Fix step adding