changes for parsing