2 major changes needed