Updated goflymake