First sweep of modifications