Small changes in generator