Reorganized for new Stratton changes.