Assignment generator much improved