Update with changes from Ryan's repo