I know there is Friedman's ANOVA for dependent variables, but this it does not include between-subject factors. I am looking for a non-parametric analysis method that can be applied to a mixed experimental design (one within-subject factor, two levels; one between-subject factor, three levels).