minor changes in generator