updated analysis routines