WP2 modified, other minor changes