calc related changes -- figured out embedded mode