Updated analysis routines to those used for EPS.