last changes before edition (part 1)