Minimalist rework version