Rearranging some static functions...