Use dougm's goflymake again