changed generated functions