last changes improved