As discussed, the response should be re-built