Rearranging some calls.