Some improvements
Confused