Update now with highliter