updated files with generators