- Some improvements