correct unit return and remove auto add to coreUnits