Updating...
Improving the code