Some modif.