some changes for new CS api