[+] rewritten parser