revert back to two response types