Upgraded to new multi-core lib