Updated CalcTA and changed name of KillMultiWaves to KillWavesMulti