touched up wagn generator again