Submitting the latest code
Improvements