several of changes Ryan G. and I discussed