Some improvements
Improvements