Added final version of calculator fully functional for C1 and C2