add new calculations from klaus