Improved YTW, added YTWz