Refactored to incorporate request