some changes for SO part