Updates to controller. Easier to modify understand the loading sequence/configuration - if someone needs to