Updated as of talk on 7-22