added old calc