Change waveguide to WG17