Trying to fix what I didn’t break, myself