Code flow update