add calc and change build file