Modifications for WP 4.1