Some modifs