updated orange, added body of function of calculation, added params