Word gen, changed structure a bit