Updated flow for appshop - format