major update on core.noWadj