Adding Simon's 3.01 release code.