Auto gen changes that I hope doesn't break things