First major change to get up to speed with a production release