just doing a little function rearranging.