Lastest Changes to my Parser functions