refactor to fit the modified API request
10 files changed