my changes to who and what