[*] Some improvements