updates to analysis 2