Updated wp and np