Adapted nomenclature
Better cash rebate + average cash rebate
Started working on margin field