Feature/heuristic 21