rekeyed for correct collection of @surfaceList, @patchList