This edit was longer than I expected