Moving some functions to better locations.