Added Periode and other calculations