refactored Request and so on