flow improvements