Alternative #1282 changes just modifying Friend