Changes following WP's review and feedback