Updated with CALMparams service and controller files