updated files, moved code to MyParser