[Added] Main methods and logic
[Modified] Main methods and logic