Added heuristics to Makefile