Updated for analysis