The updated extension with highlighting!