Good changes to library