Last changes before reformat