continued adding and refactoring responses