changed order within sets of d and f basis functions