Changes for WP submission