more work on library rework