added another one calculation

branches merged together