some changes for Q#2