Cleaning up new ordering
Merge branch 'master' of https://github.com/Rubbishman/rivl