Updated for new lib