Small improvements on NW
Commented part not working in NW