Numerous calculation functions added...