Changed highlight to be late triggered instead of directly