calc ready for package review, for real