Moved order

moved things around into more logical order