some changes for 2/3