New API and Fixed User flow