Final changes for library project.