Artchitecturing the flow again after evaluation