flow changes and header update