some changes in Order activity