* Patches by Udi Finkelstein, 2 June 2003: