Re-implemented highlighting