Changes following WP's review