Improve second HIW demo a bit