Mark McDermott re-does WP