some changes at the parser