Working on the last changes