Simpler flow :slightly_smiling_face: