preparing versions 3.1 and 4.0