Integrated last changes