Improved timing in block based flow
Block based flow now allows GNRs