Renamed for new release
Readded old generate