v1.0.5 better flow