Adding Ryan's changes