more last changes