updated to new lib