move ordering for second run of api around a bit