fixed NW, tests passed