added highlight back in, but its far from production