Autogeneration seems to have changed slightly.