Adaptation of WP for requested changes