Updated the parser so it parses the end goal