minor changes to analysis file (more general)