refactored requests