Updated to reflect summer-cleanup.