Refactored Out Handler By Request