Bring in v7.01 code