added fields to calc