Sawtooth activity and heat pulse propagation in Ohmically heated and centre and edge beam heated TFTR plasmas