adapt to  new parser