Second round of factor(0),factor(1) changes