changed the way analysis are handled