Some improvements...