Improve WoWP :)