Ryan's changes