Reordering done, still need to thread maux through before it will compile