Update source to use new lib funcs