Implemented correctness highlighting --testing needed