Reordering of flow to better support mobile