update based on WP3.3.1 to 3.8.1