Updated logic regarding calculated fields