Added heuristics for all types of goals