Re-adding controller for other calculators