Refactored calcTargets & startTargets.