improve picup flow