0.5.4 Updated flow