revised awaptools wnz