Almost final version.
last changes