Upgrading parser

It does much more know