Made a proper calc program