Introduce preview and remove oauth logic