add highlight support!