basket and first response from server refactored