[Improved] Application flow can be better