Changes due to Rolf's random redesign