Added calc module