AI working fine, it is time to add more heuristics and bettter performance