Make some of the functions public