A little more rearranging of functions.