Making some modifications
Refactored