some changes for debug