Version submitted as 20051019-4