New Flow for checks, rewritten structure