add Calculator and dic