Some improvements (Again)