a more logical rearrangement