proposed parser changes