added feature and limited to WP