Added to Calc Method. Haven't tested yet.