some changes for parsing