updated for new lib