added calculator, not yet enabled