Reinitialized
Manually merged old and new
Manually merged old and new