+ updates for new response logic