Added cashflow metric and deleted current profit margin