demo tweaks with Azhar