continuing conversion to library