oracle
committed
on 12 Oct 01
removed debug code, changed names