new TODO list
fix generators fail