Improvements
Excellent stuff added