Can we de-duplicate the code from response_add