Brought parser to the level of the patch