Finished first rev of calculated version