Added dirty version of CalcAmplitude and other stuff