Added auto-highlight