Ryan's changes to master