Overall structure improved; weak randomized class assignment in place.