Merge Ryans changes