Changed ellipticity calculation to use mode