Adjusted ordering of long-to-wide step and data decoration for much more efficency