change highlight behaviour