Some improvements in place