Added delta and gamma calculations