More changes to help flow