Change partition functions to static