First code changes. Very "Indev" version 3.0