Improved conflict handling of cores
Tweaked _neededToChange