last changes :( but not done yet #-X