Added new parser.. and it's soo much better