updated parser and normalized changes