Redo rebuild for suacy with the correct series set