other 2 conds added to analysis & graphs