Added highlighting state
Changed highlight state condition