No, I don't think George has had the technology up until now to make Han Solo the good guy he wanted him to be in '97 and last year. In the new 2007 version, Han Solo will allow Greedo to shoot and miss him three times before giving him a complete psychoanalysis to get to the root of his trigger happy persona and his lack of firing skills. Then Han will hand over the keys to his condo in Florida for Greedo to crash at.