Make sure the lib functions as well