New code for new cores
Deal with varied usage