added way/generator ~2.6