last changes & itegration