cleaned up pass 10000 and np 15