done calc
final commit