Reverted generator_functions to correct version