Updated with progress on NUMA