merging ryan's into mine