Bring in v6.02 code