Bring in v6.03 code