improve flow walls
merge