Move generator outputs correctly

hopefully bug free