Rework setup