parse and scanner changes