Making it works on WP