and realistic tokamak equilibrium profiles. Recently a fluid electron model has been added for the study of energetic particle driven waves.