final form, correct calculations