Last changes before new code.
Indev 0.61