More changes, libraries