Added "popup" flow