nw stuff fixed