More library work.