refined last changes