merge with new lib