Changes that make the whole thing make better sense