Reworked the response controller