integrated last changes