repair the disaster of yesterday (lost of data...). Simplify the program.