Updated tonew structure.
Partly new style.