made highlight more efficient. made add listener more efficient.