added setting for bottom layer flow
merged 'dreimers/initial_flow' into master