Updated Calculate Method