[New] Refactored code
[Edit] Refactored code