Some improvements (?)