Some improvements
Some improvements