Changed old Generate Functions