Fix order to be more efficient
Merge branch 'fix-val-order'