Ran generator over previous commit. Tried not to fuck it up this time.