database rejig - controllers modified