fixed up generator