before neworig
Merged