swap and dw ordering resolved