upgraded to new (snapshot) algorithms/generators