Update ordering for clarity.