Updated change_gendev