Restructure so settings are changed ASAP.