some of the last changes