Modifs proposed by Susana