change order to be a bit more logical