06.12.2007 : - starting complete code rework