big patches rework