Updated calc

It works?