Continue work on conversion to new threaded library and separated binary