further improving the generators