implemented vincents changes in the parser