controller-thin-model-fat related amendations