FIXED: Better step separation.