Rearranged order of things to be more logical.