partial fetch refactor