update todo after generators headache research