added missing wa specific code