fairly sizable change to no longer assume (apparently rely on) singleton cubes