refactored to class request calls