added calculated fields