Cleaned up a little bit so a .w2p can be "released"