Intermediate version just because so much has changed.