Edit to Matt's proposed changes