put back in functions that don't need to be commented out