remove manual gen add kludge