Improoving mask gestion