last changes and integration