updated version after adding generators