refactoring, add `2` endpoint