mixed Ryans and Mikes edits