Addressing Farrell comments and re-generating