Calculation section added along with date control, attributions updated