oracle
committed
on 24 Jan 02
remove current_page stuff, fixed conflict