Merge Ryan's changes