last changes by AM