changed calculator base class