update according to 3.1.1