Changes to new lib