Enhance NoFi demo