Calculator now compatible with Profile class