Added Methods
Improved Code