Grade-calculator V2

Update calculate command