correct entity generation
save