A bunch of changes from Ryan