Revised version which also handles the --oblivious case.

-- 
Regards,
Christian