parser and funciton updates