Rework to single solution