Changed the parser completely