Gen update from wm2