Added mash calculations to factory