Reworked the Response flow