Changes made by Chris K in the library