added remapings for WQ Wq W and Q