modifications suggested by Sylvain Le Gall
regenerated by oasis setup