Building generator progress. One bug left