Addressing flow wise comments