update to parse.h and parse.cc