Remaked version with generation data