changing parser implementation