Update to how response receiver works