update: try to include highlighting