oracle
committed
on 25 Oct 01
swap and rename working