Updates
Refactored code