Now make all these changes work right together.