Latest modifications.  Dispersion/eaxis conversion not working