Added last changes