Ported new library over to new version