some changes to 3.1