Update of way/generators

complete update