Adding more of Ryan's changes.