modified parsing rules