Re-ordering of stuff to make more sensicles