new library clean up and add back to bug fix identified in original libraries