diff --git a/commotionwireless.net/_includes/cck/building-mounting-modules.html b/commotionwireless.net/_includes/cck/building-mounting-modules.html
index d47cd197..2c0783c2 100644
--- a/commotionwireless.net/_includes/cck/building-mounting-modules.html
+++ b/commotionwireless.net/_includes/cck/building-mounting-modules.html
@@ -2,6 +2,7 @@
 If you are building a wireless network that covers a wide area, such as a town or large neighborhood, you may need to install some routers outdoors or on rooftops. Consult the guides and documents below for some help on selecting the proper tools, hardware, and mounting kits - as well as a few tips on effective and safe installation methods.
 </p>
 <ul>
+	<li><a href="/docs/cck/building-mounting/plan-wireless-sites">Plan Wireless Sites</a>: A set of worksheets to plan out wireless site installations, with examples on use.</li>
 	<li><a href="/docs/cck/building-mounting/gather-tools-and-wireless-equipment">Gather Tools and Wireless Equipment</a>: A list of suggested tools and equipment to use for installing wireless hardware.</li>
 	<li><a href="/docs/cck/building-mounting/learn-rooftop-basics">Learn Rooftop Basics</a>: Tips for working on roofs.</li>
 	<li><a href="/docs/cck/building-mounting/learn-about-rooftop-mounts">Learn About Rooftop Mounts</a>: A guide to different mounting hardware and how to install it.</li>
diff --git a/commotionwireless.net/_includes/docs_cck_building_menu.html b/commotionwireless.net/_includes/docs_cck_building_menu.html
index fcd7210f..8544c202 100644
--- a/commotionwireless.net/_includes/docs_cck_building_menu.html
+++ b/commotionwireless.net/_includes/docs_cck_building_menu.html
@@ -1,4 +1,5 @@
 <ul class="submenu">
+  <li {% if page.url contains '/docs/cck/building-mounting/plan-wireless-sites' %} class="active" {% endif %}><a href="{% if page.lang != 'en' %}/{{ page.lang }}{% endif %}/docs/cck/building-mounting/plan-wireless-sites">Plan Wireless Sites</a></li>
   <li {% if page.url contains '/docs/cck/building-mounting/gather-tools-and-wireless-equipment' %} class="active" {% endif %}><a href="{% if page.lang != 'en' %}/{{ page.lang }}{% endif %}/docs/cck/building-mounting/gather-tools-and-wireless-equipment">Gather Tools and Equipment</a></li>
   <li {% if page.url contains '/docs/cck/building-mounting/learn-rooftop-basics' %} class="active" {% endif %}><a href="{% if page.lang != 'en' %}/{{ page.lang }}{% endif %}/docs/cck/building-mounting/learn-rooftop-basics">Learn Rooftop Basics</a></li>
   <li {% if page.url contains '/docs/cck/building-mounting/learn-about-rooftop-mounts' %} class="active" {% endif %}><a href="{% if page.lang != 'en' %}/{{ page.lang }}{% endif %}/docs/cck/building-mounting/learn-about-rooftop-mounts">Learn About Rooftop Mounts</a></li>
diff --git a/commotionwireless.net/_posts/2015-04-22-announcing-commotion-collaboration-with-wlanslovenija.md b/commotionwireless.net/_posts/2015-04-22-announcing-commotion-collaboration-with-wlanslovenija.md
new file mode 100644
index 00000000..4a68c4e8
--- /dev/null
+++ b/commotionwireless.net/_posts/2015-04-22-announcing-commotion-collaboration-with-wlanslovenija.md
@@ -0,0 +1,18 @@
+---
+layout: blog
+title: Announcing collaboration with wlan slovenija
+categories: [development, collaboration, nodewatcher]
+created: 2015-4-22
+changed: 2015-4-22
+teaser_image: posts/wlan-slovenija.png
+post_author: Josh King
+lang: en
+---
+The Commotion project is pleased to announce our collaboration with [wlan slovenija](https://wlan-si.net)!
+<!--more-->
+
+Wlan slovenija is an initiative to build an open wireless network throughout the country of Slovenia. Commotion and wlan slovenija share common goals around the proliferation of free access to information through the empowerment of individuals and communities. We're proud to further those goals through work to bring wlan slovenija's amazing [Nodwatcher](https://dev.wlan-si.net/intertrac/wiki%3ANodewatcher) platform to users of Commotion.
+
+Nodewatcher is an open-source, web-based tool for planning, deploying, monitoring, and maintaining community networks. Its modular system provides these capabilities in a way that is specifically designed for a community-oriented approach, and by adding support for Commotion to Nodewatcher we'll be able to utilize the strengths of both projects to bring the best possible set of tools to communities for building their own infrastructure.
+
+To learn more about wlan slovenija, visit [their website](https://wlan-si.net), look at their [Nodewatcher project page](https://dev.wlan-si.net/intertrac/wiki%3ANodewatcher), or view their [live Nodewatcher dashboard](https://nodes.wlan-si.net).
diff --git a/commotionwireless.net/docs/cck/building-mounting/plan-wireless-sites/index.md b/commotionwireless.net/docs/cck/building-mounting/plan-wireless-sites/index.md
new file mode 100644
index 00000000..b152a623
--- /dev/null
+++ b/commotionwireless.net/docs/cck/building-mounting/plan-wireless-sites/index.md
@@ -0,0 +1,95 @@
+---
+layout: cck
+title: Plan Wireless Sites
+site_section: docs
+sub_section: [cck,cck-building]
+pdf: cck/building-mounting/CCK-Plan-Wireless-Sites.pdf
+pdf-all: false
+categories: 
+created: 2015-05-05
+changed: 2015-05-05
+post_author: Andy Gunn
+lang: en
+---
+![Plan Wireless Sites intro graphic](/files/Plan_wireless_sites_graphic.png "Intro graphic")
+
+## Introduction
+
+When it comes time to design and build your community wireless network, it is helpful to have as much detail about each installation site before you visit. The document below describes some helpful tips for router placement on, in, and around buildings based on what those routers do. After that, there is a [Network Site Worksheet](/files/cck/building-mounting/Network-site-worksheet.pdf) to download and use when surveying sites for installations. To best use this worksheet, there are [examples](/files/cck/building-mounting/Site-worksheet-examples.pdf) of different types of sites and how to use the worksheet.
+
+This process should normally come after you [Inventory the Neighborhood](/docs/cck/planning/inventory-the-neighborhood/), and decide what sites seem best. The worksheets will give you the necessary detail to see what sites can connect, what types of routers you should use, and what hardware and tools the site installation will require.
+
+A Build-It-Ourselves Guide to Community Networks Reading through this document and the worksheet examples should take about 30 to 45 minutes. Visiting a possible installation site to fill out the worksheet may take up to an hour, depending on the size of the site, and the difficulty to reach different areas of the site.
+
+
+### MATERIALS + SUPPLIES NEEDED
+
+* PDF or printed versions of the [Network Site Worksheet](/files/cck/building-mounting/Network-site-worksheet.pdf) and [Site Worksheet Examples](/files/cck/building-mounting/Site-worksheet-examples.pdf).
+* Pens or color markers.
+
+
+## Router Placement
+
+Wireless signals, such as the Wi-Fi signals used in community wireless networks, travel by line of sight. If two routers have a building or trees between them, the signals will be blocked and they will be unable to communicate. For this reason, wireless networking equipment needs to be mounted on tall towers or high rooftops to link homes and businesses together. The downside of this is that people on the ground may have a hard time connecting to these somewhat far away nodes.
+
+A common method for designing networks (such as the Internet!) is to build it in layers:
+
+* The top or highest layer has the fastest connections, and provides the core connectivity. In a neighborhood or town network, the core would connect distant parts together.
+* The middle layers have fast connections, but also distribute or move large amounts of traffic from people using the network to the core layer, which then connects out to the Internet.
+* The lowest layer provides access to people using the network. You would connect your phone, tablet or laptop to an Access Point, which in turn is connected to the distribution layer, and out to the Internet. Wireless networks can be designed in the same way, and in the case of community networks, using multiple layers can lead to better performance and more capacity on the network.
+
+
+### Core Connections - Equipment Mounted Higher
+
+![Core network layer](/files/Network_layer_rooftop.png "Equipment mounted on high rooftops")
+
+The wireless signals can go further, thereby covering more area and linking parts of the neighborhood or town together. Directional routers can be used for more direct point-to-point links, adding capacity in sections of the neighborhood or town. Equipment mounted very high up doesn’t provide a good connection for the people on the ground or inside of the buildings.
+
+
+### Access Connections - Equipment Mounted Lower
+
+![Access network layer](/files/Network_layer_street.png "Equipment mounted for user access")
+
+Wireless routers close to the ground provide better coverage so people can connect their phones, tablets or laptops to the network. Often times, these routers can be replaced with simple low-cost Access Point devices, and allow the higher layers to determine how the connect to the rest of the network.
+
+
+### Distributing Connections - Equipment in the Middle
+
+![Distribution network layer](/files/Network_layer_middle.png "Equipment connecting the core to the access network")
+
+There are many ways to connect from the top of the network to the bottom. Cables can run from the top layer to Access Points where users connect, or there could be a cluster of mesh nodes wirelessly distributing access to a section of a neighborhood. In other cases, point-to-point or point-to-multipoint (common Wireless Internet Service Provider techniques) can be used to provide connections
+to the Access connections.
+
+For more details and activities on these types of connections, review [Types of Wireless Networks](/docs/cck/networking/types-of-wireless-networks/).
+
+
+## Site planning worksheets
+
+![Site worksheet examples graphic](/files/Site_worksheet_examples.png "Site Worksheet examples graphic")
+
+From here, you can start taking a closer look at the sites you are planning to install your community network equipment in and on. Consult the [Prep and Install Rooftop nodes](/docs/cck/building-mounting/prep-install-rooftop-nodes/), [Learn Rooftop Basics](/docs/cck/building-mounting/learn-rooftop-basics/), and [Learn About Rooftop Mounts](/docs/cck/building-mounting/learn-about-rooftop-mounts/) documents if you are still looking for more tips on installing on rooftops.
+
+For the most part, installing wireless equipment on rooftops and indoors should be common sense. When you visit a site it will most likely be very clear where the best spot for the equipment will be, where the cables can be run, and where the indoor access points will go so people can access the network.
+
+Download the [Network Site Worksheet](/files/cck/building-mounting/Network-site-worksheet.pdf) and print enough copies for the sites you will visit and install. Look through the [Site Worksheet Examples](/files/cck/building-mounting/Site-worksheet-examples.pdf) to get an idea of what to look for, and how to fill them out.
+
+
+## Definitions
+
+**AP (Access Point):** A device that allows wireless devices to connect to a wired network using Wi-Fi or related standards.
+
+**Ethernet:** A type of networking protocol - it defines the types of cables and connections that are used to wire computers, switches, and routers together. Most often Ethernet cabling is Category 5 or 6, made up of twisted pair wiring similar to phone cables.
+
+**Line of Sight:** An unobstructed path for wireless signals to travel between buildings or devices.
+
+**Mast:** A metal pipe or pole used to mount equipment. It is usually 1 & 1/2" (4cm) in diameter, and around 5 feet (1.5 meters) long. Antenna masts will often have one tapered end so they can be stacked to form taller masts.
+
+**Site:** A location in a neighborhood or community to place wireless equipment.
+
+
+## Related Information
+
+As mentioned above, there are a number of other documents related to site planning and installation in the [Planning](/docs/cck/planning/) and [Building + Mounting](/docs/cck/building-mounting/) sections. You can start with [Inventory the Neighborhood](/docs/cck/planning/inventory-the-neighborhood/), then explore [Learn Rooftop Basics](/docs/cck/building-mounting/learn-rooftop-basics/) and [Prep and Install Rooftop nodes](/docs/cck/building-mounting/prep-install-rooftop-nodes/) before using the worksheets discussed here.
+
+You can also consult [Common Hardware Setups](/docs/cck/installing-configuring/common-hardware-setups/) and [Advanced Hardware Setups](/docs/cck/installing-configuring/advanced-hardware-setups/) for more examples on how to connect wireless equipment together for community networking. In addition, [Types of Wireless Networks](/docs/cck/networking/types-of-wireless-networks/) details more methods for connecting your neighbors!
+
diff --git a/commotionwireless.net/docs/cck/networking/wireless-challenges/index.md b/commotionwireless.net/docs/cck/networking/wireless-challenges/index.md
index b57e64cc..edfb3442 100644
--- a/commotionwireless.net/docs/cck/networking/wireless-challenges/index.md
+++ b/commotionwireless.net/docs/cck/networking/wireless-challenges/index.md
@@ -3,129 +3,116 @@ layout: cck
 title: Design Your Network - Wireless Challenges
 site_section: docs
 sub_section: [cck,cck-networking]
-pdf: cck/networking/CCK-Wireless_Challenges.pdf
-pdf-all: true
+pdf: cck/networking/Wireless_Challenges.pdf
+pdf-all: false
 categories: 
 created: 2013-11-04
-changed: 2014-08-04
-post_author: critzo
+changed: 2014-04-15
+post_author: Andy Gunn
 lang: en
 ---
-<p><img alt="Wireless Challenges graphic" src="/files/styles/large/public/CCK_Wireless_Challenges_intro_graphic.png" /></p>
+![Wireless Challenges intro graphic](/files/styles/large/public/CCK_Wireless_Challenges_intro_graphic.png "Intro graphic")
 
-<section id="introduction">
-<h2>Introduction</h2>
+## Introduction
 
-<p>To continue planning our networks, you will need to know a bit more about how wireless signals work. All wireless signals are affected by the environment around us—the walls and windows of your house or office, the trees and rain, other wireless signals, and sometimes microwave ovens!</p>
+To continue planning our networks, you will need to know a bit more about how wireless signals work. All wireless signals are affected by the environment around us—the walls and windows of your house or office, the trees and rain, other wireless signals, and sometimes microwave ovens!
 
-<p>This activity takes you through a set of wireless challenges to solve on your own or as a group. It is intended to follow <a href="/docs/cck/planning/design-your-network-every-network-tells-story">Design your Network: Every Network Tells a Story</a>, but it can stand alone as well.</p>
+This activity takes you through a set of wireless challenges to solve on your own or as a group. It is intended to follow [Design your Network: Every Network Tells a Story](/docs/cck/planning/design-your-network-every-network-tells-story), but it can stand alone as well.
 
-<p>If you are working through the problem sets alone, it may take between 20 and 40 minutes, depending on how thorough you are with your solutions! As a group, it will take longer—probably closer to an hour.</p>
-</section>
+If you are working through the problem sets alone, it may take between 20 and 40 minutes, depending on how thorough you are with your solutions! As a group, it will take longer—probably closer to an hour.
 
-<section id="materials-and-supplies-needed">
-<h3>MATERIALS + SUPPLIES NEEDED</h3>
-<p><a href="/files/cck/networking/3-CCK-Networking-Wireless_Challenges_Presentation.pdf">Wireless Challenges Presentation</a> - Either printed as a handout, or introduction to a group activity.<br />
-<a href="/files/cck/networking/3-CCK-Networking-Wireless_Challenges_Presentation.pdf"><img height="392" src="/files/styles/large/public/CCK_Wireless_Challenges_presentation_download.png" width="510" /></a></p>
+### MATERIALS + SUPPLIES NEEDED
 
-<p><a href="/files/cck/networking/3-CCK-Networking-Wireless_Challenges_Scenarios_Problems_and_Solutions.pdf">Problem and Solution flashcards</a> - printed out on 8½ by 11” paper.<br />
-<a href="/files/cck/networking/3-CCK-Networking-Wireless_Challenges_Scenarios_Problems_and_Solutions.pdf"><img height="328" src="/files/styles/large/public/CCK_Wireless_Challenges_flashcard_download.png" width="480" /></a></p>
+[Wireless Challenges Presentation](/files/cck/networking/Wireless_Challenges_Presentation.pdf "Wireless Challenges Presentation") - Either printed as a handout, or introduction to a group activity.
+![Presentation download image](/files/styles/large/public/CCK_Wireless_Challenges_presentation_download.png)
 
-<p>(Optional) Router graphics from the <a href="/docs/cck/planning/design-your-network-every-network-tells-story">Design your Network: Every Network Tells a Story</a> packet.</p>
+[Problem Scenario Worksheets](/files/cck/networking/Problem_Scenario_Workbook.pdf) - printed out on 8½ by 11” or A4 paper.
+![Problem worksheets download image](/files/styles/large/public/CCK_Wireless_Challenges_flashcard_download.png)
 
-<p>A surface to work on (preferably a table so people with mobility challenges can participate comfortably).</p>
+[Example Solutions to Problem Scenarios](/files/cck/networking/Example_Solutions_to_Wireless_Challenges_Workbook.pdf) - printed out on 8½ by 11” or A4 paper.
+![Example solutions download image](/files/styles/large/public/CCK_Wireless_Challenges_flashcard_download.png)
 
-<p>Pens or color markers.</p>
-</section>
+(Optional) Router graphics from the [Every Network Tells a Story](/docs/cck/planning/design-your-network-every-network-tells-story) packet.
 
-<section id="scenarios-and-flashcards">
-<h2>Scenarios and Flashcards</h2>
+A surface to work on (preferably a table so people with mobility challenges can participate comfortably).
 
-<p>This guide goes through a set of scenarios that show and describe common challenges that come up when building wireless networks. Each scenario is presented as a flashcard: a problem is shown on one page, and one or more possible solutions are shown on the pages that follow.</p>
+Pens or color markers.
 
-<p>The set of flashcards can be used in two ways:</p>
 
-<div>
-<p><strong>1. As individual examples that you can read through and learn from.</strong> In this format, you should print out the set of problems and solutions and go through them one by one. For each problem, draw the solution you think will solve the wireless challenge. Then compare your answer to the examples we provide on the following pages.</p>
+## Scenarios and Flashcards
 
-<p><strong>2. As printouts that you or others can work through as a group.</strong> In this format, you should print out multiple copies of just the problems (or set aside the solutions for later). Hand out the stack of problem flashcards, and work through each one in a group, in small groups or pairs, or as individuals. Then come back together and compare solutions with each other, and with the example solutions provided.</p>
-</div>
+This guide goes through a set of scenarios that show and describe common challenges that come up when building wireless networks. Each scenario is presented as a flashcard: a problem is shown on one page, and one or more possible solutions are shown on the pages that follow.
 
-<p>If you are working through the wireless challenges as a group, you can use the <a href="/files/cck/networking/3-CCK-Networking-Wireless_Challenges_Presentation.pdf">presentation</a> to introduce the concept, and go through the rules that are also presented below.</p>
-</section>
+The set of flashcards can be used in two ways:
 
-<section id="what-are-the-wireless-challenges">
-<h2>What are the Wireless Challenges?</h2>
+**1. As individual examples that you can read through and learn from.** In this format, you should print out the set of problems and solutions and go through them one by one. For each problem, draw the solution you think will solve the wireless challenge. Then compare your answer to the examples we provide on the following pages.
 
-<p>Each scenario presents a specific challenge or problem that comes up when working with wireless equipment. They are categorized as:</p>
+**2. As printouts that you or others can work through as a group.** In this format, you should print out multiple copies of just the problems (or set aside the solutions for later). Hand out the stack of problem flashcards, and work through each one in a group, in small groups or pairs, or as individuals. Then come back together and compare solutions with each other, and with the example solutions provided.
 
-<p><strong>Distance</strong>—Wireless signals lose power the further they travel, no matter the type of antenna.<br />
-<img alt="" class="media-image" height="288" src="/files/styles/large/public/CCK_Wireless_Challenges_distance.png" width="510" /></p>
+If you are working through the wireless challenges as a group, you can use the [presentation](/files/cck/networking/3-CCK-Networking-Wireless_Challenges_Presentation.pdf) to introduce the concept, and go through the rules that are also presented below.
 
-<p><strong>Line of Sight</strong>—Wireless signals can encounter total barriers, preventing connections.<br />
-<img alt="" class="media-image" height="241" src="/files/styles/large/public/CCK_Wireless_Challenges_line_of_sight.png" width="510" /></p>
 
-<p><strong>Barriers</strong>—Wireless signals lose signal strength through solid objects.<br />
-<img alt="" class="media-image" height="266" src="/files/styles/large/public/CCK_Wireless_Challenges_barriers.png" width="510" /></p>
+## What are the Wireless Challenges?
 
-<p><strong>Interference</strong>—Routers can be too loud, making it impossible for them to hear each other.<br />
-<img alt="" class="media-image" height="237" src="/files/styles/large/public/CCK_Wireless_Challenges_wireless_interference.png" width="510" /></p>
+Each scenario presents a specific challenge or problem that comes up when working with wireless equipment. They are categorized as:
 
-<p><strong>Weather</strong>—Weather conditions can disrupt wireless signals.<br />
-<img alt="" class="media-image" height="471" src="/files/styles/large/public/CCK_Wireless_Challenges_weather.png" width="510" /></p>
+**Distance** — Wireless signals lose power the further they travel, no matter the type of antenna.
+![Distance graphic](/files/styles/large/public/CCK_Wireless_Challenges_distance.png)
 
-<p><strong>Electrical power issues</strong>—Routers need steady electricity to work correctly.<br />
-<img alt="" class="media-image" height="330" src="/files/styles/large/public/CCK_Wireless_Challenges_power_issues.png" width="510" /></p>
-</section>
+**Line of Sight** — Wireless signals can encounter total barriers, preventing connections.
+![Line of sight graphic](/files/styles/large/public/CCK_Wireless_Challenges_line_of_sight.png)
 
-<section id="going-through-the-wireless-challenges">
-<h2>Going through the Wireless Challenges</h2>
+**Barriers** — Wireless signals lose signal strength through solid objects.
+![Barriers graphic](/files/styles/large/public/CCK_Wireless_Challenges_barriers.png)
 
-<p>The Wireless Challenge Problem and Solution sets can be studied at your own pace, if you are going through them on your own. Download the PDF of <a href="/files/cck/networking/3-CCK-Networking-Wireless_Challenges_Scenarios_Problems_and_Solutions.pdf">Problems and Solutions</a>, then go through each scenario one by one. Draw the solution to the problem presented in each case, and then compare your solution to the examples on the pages following. No cheating!</p>
+**Interference** — Routers can be too loud, making it impossible for them to hear each other.
+![Interference graphic](/files/styles/large/public/CCK_Wireless_Challenges_wireless_interference.png)
 
-<p>If you are working as a group, we suggest this activity:</p>
+**Weather** — Weather conditions can disrupt wireless signals.
+![Weather graphic](/files/styles/large/public/CCK_Wireless_Challenges_weather.png)
 
-<ul>
-	<li>Print out just the "Problem" pages, or set aside the "Solution" pages for later.</li>
-	<li>Break in to small groups or pairs, or work individually.</li>
-	<li>The small groups draw solutions on each flashcard, and save them until everyone is finished.</li>
-	<li>The groups then compare the solutions with each other, and finally with the example solutions provided.</li>
-</ul>
+**Electrical power issues** — Routers need steady electricity to work correctly.
+![Electrical power issues graphics](/files/styles/large/public/CCK_Wireless_Challenges_power_issues.png)
 
-<p>Keep in mind, there are many possible solutions to the Wireless Challenges presented here. The examples shown are just one or two options. If you think of new solutions, or think we have made a mistake somewhere, please let us know! Get in touch using the <a href="https://commotionwireless.net/contact">feedback form</a>.</p>
-</section>
 
-<section id="rules-for-solving-the-challenges">
-<h2>Rules for Solving the Challenges</h2>
+## Going through the Wireless Challenges
 
-<p>When you go through the Wireless Challenges, there are a few guidelines for how to read the connections between nodes, and how to draw your own.</p>
+The Wireless Challenge Problem and Solution sets can be studied at your own pace, if you are going through them on your own. Download the PDF of [problems](/files/cck/networking/Problem_Scenario_Workbook.pdf) and [solutions](/files/cck/networking/Example_Solutions_to_Wireless_Challenges_Workbook.pdf), then go through each scenario one by one. Draw the solution to the problem presented in each case, and then compare your solution to the examples on the pages following. No cheating!
 
-<p><strong>Wireless link quality</strong>—Solid or dashed lines show the strength of the link between two nodes. A solid green line is best; a dashed yellow line is okay; and a dotted pink or red line is a bad or broken link.<br />
-<img alt="" class="media-image" height="249" src="/files/CCK_Wireless_Challenges_signal_quality_rules.png" width="510" /></p>
+If you are working as a group, we suggest this activity:
+* Print out just the "Problem" pages, or set aside the "Solution" pages for later.
+* Break in to small groups or pairs, or work individually.
+* The small groups draw solutions on each flashcard, and save them until everyone is finished.
+* The groups then compare the solutions with each other, and finally with the example solutions provided.
 
-<p><strong>Wireless signal strength</strong>—Routers have different speaking and listening powers.</p>
+Keep in mind, there are many possible solutions to the Wireless Challenges presented here. The examples shown are just one or two options. If you think of new solutions, or think we have made a mistake somewhere, please let us know! Get in touch using the [feedback form](/contact).
 
-<p><img alt="" class="media-image" height="295" src="/files/styles/large/public/CCK_Wireless_Challenges_power_levels_rules_2.png" width="480" /><br />
-&nbsp;</p>
 
-<p><strong>Appropriate power levels</strong>—Due to the different speaking and listening powers, choose routers carefully. It is important to use the lowest power router that creates a good link. Using routers that have too much speaking power can cause interference.<br />
-<img alt="" class="media-image" height="468" src="/files/CCK_Wireless_Challenges_power_levels_rules.png" width="510" /></p>
+## Rules for Solving the Challenges
 
-<p><strong>Links over long distance</strong>—Some links will need routers that have more power to reach further.<br />
-<img alt="" class="media-image" height="242" src="/files/CCK_Wireless_Challenges_distance_rules.png" width="510" /></p>
-</section>
+When you go through the Wireless Challenges, there are a few guidelines for how to read the connections between nodes, and how to draw your own.
 
-<section id="section-definitions">
-<h2>Definitions</h2>
+**Wireless link quality** — Solid or dashed lines show the strength of the link between two nodes. A solid green line is best; a dashed yellow line is okay; and a dotted pink or red line is a bad or broken link.
+![Signal quality rules](/files/WirelessChallenges-Rules-signal-quality.png)
 
-<dl>
-	<dt>Interference</dt>
-	<dd>Anything which changes or disrupts a signal as it travels along a channel between a source and a receiver. In the case of wireless, this typically refers to other signals or noise that the router needs to filter out when listening for other signals.</dd>
-</dl>
-</section>
+**Wireless signal strength** — Routers have different speaking and listening powers.
+![Power level rules](/files/styles/large/public/CCK_Wireless_Challenges_power_levels_rules_2.png)
 
-<section class="related-information" id="section-related-information">
-<h2>Related Information</h2>
+**Appropriate power levels** — Due to the different speaking and listening powers, choose routers carefully. It is important to use the lowest power router that creates a good link. Using routers that have too much speaking power can cause interference.
+![Power level rules 2](/files/CCK_Wireless_Challenges_power_levels_rules.png)
 
-<p>This module is intended to come immediately after <a href="/docs/cck/planning/design-your-network-every-network-tells-story">Design your Network: Every Network Tells a Story</a>. It should also lead in to <u>Learn About Wireless</u>. The sequence is designed to take communities or individuals from planning a network, through learning about common problems, to specifics about how wireless signals and equipment work.</p>
-</section>
+**Links over long distance** — Some links will need routers that have more power to reach further.
+![Distance rules](/files/CCK_Wireless_Challenges_distance_rules.png)
+
+That's it! Try the problem scenarios out for yourself.
+
+
+## Definitions
+
+**Interference**
+Anything which changes or disrupts a signal as it travels along a channel between a source and a receiver. In the case of wireless, this typically refers to other signals or noise that the router needs to filter out when listening for other signals.</dd>
+
+
+## Related Information
+
+This module is intended to come immediately after [Design your Network: Every Network Tells a Story](/docs/cck/planning/design-your-network-every-network-tells-story). It should also lead in to [Learn Wireless Basics](/docs/cck/networking/learn-wireless-basics/). The sequence is designed to take communities or individuals from planning a network, through learning about common problems, to specifics about how wireless signals and equipment work.
diff --git a/commotionwireless.net/files/CCK_Wireless_Challenges_signal_quality_rules.png b/commotionwireless.net/files/CCK_Wireless_Challenges_signal_quality_rules.png
deleted file mode 100644
index 8c8ae57b..00000000
Binary files a/commotionwireless.net/files/CCK_Wireless_Challenges_signal_quality_rules.png and /dev/null differ
diff --git a/commotionwireless.net/files/Nano_to_Pico.png b/commotionwireless.net/files/Nano_to_Pico.png
deleted file mode 100644
index 367f9717..00000000
Binary files a/commotionwireless.net/files/Nano_to_Pico.png and /dev/null differ
diff --git a/commotionwireless.net/files/Nano_to_Pico_0.png b/commotionwireless.net/files/Nano_to_Pico_0.png
deleted file mode 100644
index 367f9717..00000000
Binary files a/commotionwireless.net/files/Nano_to_Pico_0.png and /dev/null differ
diff --git a/commotionwireless.net/files/Network_layer_middle.png b/commotionwireless.net/files/Network_layer_middle.png
new file mode 100644
index 00000000..25ef8fc0
Binary files /dev/null and b/commotionwireless.net/files/Network_layer_middle.png differ
diff --git a/commotionwireless.net/files/Network_layer_rooftop.png b/commotionwireless.net/files/Network_layer_rooftop.png
new file mode 100644
index 00000000..7a43dd8b
Binary files /dev/null and b/commotionwireless.net/files/Network_layer_rooftop.png differ
diff --git a/commotionwireless.net/files/Network_layer_street.png b/commotionwireless.net/files/Network_layer_street.png
new file mode 100644
index 00000000..90ef267c
Binary files /dev/null and b/commotionwireless.net/files/Network_layer_street.png differ
diff --git a/commotionwireless.net/files/Plan_wireless_sites_graphic.png b/commotionwireless.net/files/Plan_wireless_sites_graphic.png
new file mode 100644
index 00000000..bc3e20ed
Binary files /dev/null and b/commotionwireless.net/files/Plan_wireless_sites_graphic.png differ
diff --git a/commotionwireless.net/files/Site_worksheet_examples.png b/commotionwireless.net/files/Site_worksheet_examples.png
new file mode 100644
index 00000000..79cb58f0
Binary files /dev/null and b/commotionwireless.net/files/Site_worksheet_examples.png differ
diff --git a/commotionwireless.net/files/Wireless Challenges Presentation.pdf b/commotionwireless.net/files/Wireless Challenges Presentation.pdf
deleted file mode 100644
index eebcb7aa..00000000
Binary files a/commotionwireless.net/files/Wireless Challenges Presentation.pdf and /dev/null differ
diff --git a/commotionwireless.net/files/Wireless Challenges Scenarios - Problems and Solutions.pdf b/commotionwireless.net/files/Wireless Challenges Scenarios - Problems and Solutions.pdf
deleted file mode 100644
index 00c7c688..00000000
Binary files a/commotionwireless.net/files/Wireless Challenges Scenarios - Problems and Solutions.pdf and /dev/null differ
diff --git a/commotionwireless.net/files/WirelessChallenges-Rules-signal-quality.png b/commotionwireless.net/files/WirelessChallenges-Rules-signal-quality.png
new file mode 100644
index 00000000..210716ad
Binary files /dev/null and b/commotionwireless.net/files/WirelessChallenges-Rules-signal-quality.png differ
diff --git a/commotionwireless.net/files/cck/building-mounting/CCK-Plan-Wireless-Sites.pdf b/commotionwireless.net/files/cck/building-mounting/CCK-Plan-Wireless-Sites.pdf
new file mode 100644
index 00000000..a77831aa
Binary files /dev/null and b/commotionwireless.net/files/cck/building-mounting/CCK-Plan-Wireless-Sites.pdf differ
diff --git a/commotionwireless.net/files/cck/building-mounting/Network-site-worksheet.pdf b/commotionwireless.net/files/cck/building-mounting/Network-site-worksheet.pdf
new file mode 100644
index 00000000..4bc63605
Binary files /dev/null and b/commotionwireless.net/files/cck/building-mounting/Network-site-worksheet.pdf differ
diff --git a/commotionwireless.net/files/cck/building-mounting/Site-worksheet-examples.pdf b/commotionwireless.net/files/cck/building-mounting/Site-worksheet-examples.pdf
new file mode 100644
index 00000000..34c1dd7a
Binary files /dev/null and b/commotionwireless.net/files/cck/building-mounting/Site-worksheet-examples.pdf differ
diff --git a/commotionwireless.net/files/cck/networking/3-CCK-Networking-Wireless_Challenges_Presentation.pdf b/commotionwireless.net/files/cck/networking/3-CCK-Networking-Wireless_Challenges_Presentation.pdf
deleted file mode 100644
index eebcb7aa..00000000
Binary files a/commotionwireless.net/files/cck/networking/3-CCK-Networking-Wireless_Challenges_Presentation.pdf and /dev/null differ
diff --git a/commotionwireless.net/files/cck/networking/3-CCK-Networking-Wireless_Challenges_Scenarios_Problems_and_Solutions.pdf b/commotionwireless.net/files/cck/networking/3-CCK-Networking-Wireless_Challenges_Scenarios_Problems_and_Solutions.pdf
deleted file mode 100644
index 00c7c688..00000000
Binary files a/commotionwireless.net/files/cck/networking/3-CCK-Networking-Wireless_Challenges_Scenarios_Problems_and_Solutions.pdf and /dev/null differ
diff --git a/commotionwireless.net/files/cck/networking/CCK-Defis_sans_fil.pdf b/commotionwireless.net/files/cck/networking/Defis_sans_fil.pdf
similarity index 96%
rename from commotionwireless.net/files/cck/networking/CCK-Defis_sans_fil.pdf
rename to commotionwireless.net/files/cck/networking/Defis_sans_fil.pdf
index 6f5179ea..e9bd64e2 100644
Binary files a/commotionwireless.net/files/cck/networking/CCK-Defis_sans_fil.pdf and b/commotionwireless.net/files/cck/networking/Defis_sans_fil.pdf differ
diff --git a/commotionwireless.net/files/cck/networking/Difficultes_inherentes_aux_reseaux_sans_fil.pdf b/commotionwireless.net/files/cck/networking/Difficultes_inherentes_aux_reseaux_sans_fil.pdf
deleted file mode 100644
index 0c0df98d..00000000
Binary files a/commotionwireless.net/files/cck/networking/Difficultes_inherentes_aux_reseaux_sans_fil.pdf and /dev/null differ
diff --git a/commotionwireless.net/files/cck/networking/Difficultes_inherentes_aux_reseaux_sans_fil_presentation.pdf b/commotionwireless.net/files/cck/networking/Difficultes_inherentes_aux_reseaux_sans_fil_presentation.pdf
new file mode 100644
index 00000000..e627f8d4
Binary files /dev/null and b/commotionwireless.net/files/cck/networking/Difficultes_inherentes_aux_reseaux_sans_fil_presentation.pdf differ
diff --git a/commotionwireless.net/files/cck/networking/Example_Solutions_to_Wireless_Challenges_Workbook.pdf b/commotionwireless.net/files/cck/networking/Example_Solutions_to_Wireless_Challenges_Workbook.pdf
new file mode 100644
index 00000000..56065712
Binary files /dev/null and b/commotionwireless.net/files/cck/networking/Example_Solutions_to_Wireless_Challenges_Workbook.pdf differ
diff --git a/commotionwireless.net/files/cck/networking/Exemple_des_Solutions_Classeur.pdf b/commotionwireless.net/files/cck/networking/Exemple_des_Solutions_Classeur.pdf
new file mode 100644
index 00000000..f4d5e80c
Binary files /dev/null and b/commotionwireless.net/files/cck/networking/Exemple_des_Solutions_Classeur.pdf differ
diff --git a/commotionwireless.net/files/cck/networking/Problem_Scenario_Workbook.pdf b/commotionwireless.net/files/cck/networking/Problem_Scenario_Workbook.pdf
new file mode 100644
index 00000000..f03c6345
Binary files /dev/null and b/commotionwireless.net/files/cck/networking/Problem_Scenario_Workbook.pdf differ
diff --git a/commotionwireless.net/files/cck/networking/Problemes_et_solutions.pdf b/commotionwireless.net/files/cck/networking/Problemes_et_solutions.pdf
deleted file mode 100644
index e2f20ddf..00000000
Binary files a/commotionwireless.net/files/cck/networking/Problemes_et_solutions.pdf and /dev/null differ
diff --git a/commotionwireless.net/files/cck/networking/Scenarios_des_Problemes.pdf b/commotionwireless.net/files/cck/networking/Scenarios_des_Problemes.pdf
new file mode 100644
index 00000000..72e11bb4
Binary files /dev/null and b/commotionwireless.net/files/cck/networking/Scenarios_des_Problemes.pdf differ
diff --git a/commotionwireless.net/files/cck/networking/CCK-Wireless_Challenges.pdf b/commotionwireless.net/files/cck/networking/Wireless_Challenges.pdf
similarity index 88%
rename from commotionwireless.net/files/cck/networking/CCK-Wireless_Challenges.pdf
rename to commotionwireless.net/files/cck/networking/Wireless_Challenges.pdf
index 1400030d..15460802 100644
Binary files a/commotionwireless.net/files/cck/networking/CCK-Wireless_Challenges.pdf and b/commotionwireless.net/files/cck/networking/Wireless_Challenges.pdf differ
diff --git a/commotionwireless.net/files/cck/networking/Wireless_Challenges_Presentation.pdf b/commotionwireless.net/files/cck/networking/Wireless_Challenges_Presentation.pdf
new file mode 100644
index 00000000..0961c55d
Binary files /dev/null and b/commotionwireless.net/files/cck/networking/Wireless_Challenges_Presentation.pdf differ
diff --git a/commotionwireless.net/files/posts/wlan-slovenija.png b/commotionwireless.net/files/posts/wlan-slovenija.png
new file mode 100644
index 00000000..ac407537
Binary files /dev/null and b/commotionwireless.net/files/posts/wlan-slovenija.png differ
diff --git a/commotionwireless.net/fr/docs/cck/networking/wireless-challenges/index.md b/commotionwireless.net/fr/docs/cck/networking/wireless-challenges/index.md
index 2bb7f2d4..c1438396 100644
--- a/commotionwireless.net/fr/docs/cck/networking/wireless-challenges/index.md
+++ b/commotionwireless.net/fr/docs/cck/networking/wireless-challenges/index.md
@@ -3,12 +3,12 @@ layout: cck
 title: Conception de réseaux - les défis inhérents aux réseaux sans fil
 site_section: docs
 sub_section: [cck,cck-networking]
-pdf: cck/networking/CCK-Defis_sans_fil.pdf
-pdf-all: true
+pdf: cck/networking/Defis_sans_fil.pdf
+pdf-all: false
 categories: fr
 created: 2013-11-04
-changed: 2013-11-27
-post_author: critzo
+changed: 2015-04-15
+post_author: Andy Gunn
 lang: fr
 ---
 <p><img alt="Wireless Challenges graphic" src="/files/CCK_Wireless_Challenges_intro_graphic.png" /></p>
@@ -25,9 +25,11 @@ lang: fr
 <section id="materials-and-supplies-needed">
 <h4>MATERIEL + FOURNITURE REQUISE</h4>
 
-<p><a href="/files/cck/networking/Difficultes_inherentes_aux_reseaux_sans_fil.pdf">Présentation des défis inhérents aux réseaux sans fil</a> - En version polycopiée, ou en introduction à l'activité en groupe. <br><a href="/files/cck/networking/Difficultes_inherentes_aux_reseaux_sans_fil.pdf"><img alt="" src="/files/CCK_Wireless_Challenges_presentation_download_FR.png"></a></p>
+<p><a href="/files/cck/networking/Difficultes_inherentes_aux_reseaux_sans_fil_presentation.pdf">Présentation des défis inhérents aux réseaux sans fil</a> - En version polycopiée, ou en introduction à l'activité en groupe. <br><a href="/files/cck/networking/Difficultes_inherentes_aux_reseaux_sans_fil_presentation.pdf"><img alt="" src="/files/CCK_Wireless_Challenges_presentation_download_FR.png"></a></p>
 
-<p><a href="/files/cck/networking/Problemes_et_solutions.pdf">Supports visuels : problèmes et solutions</a> -Imprimés sur du papier A4.<br><a href="/files/cck/networking/Problemes_et_solutions.pdf"><img alt="" src="/files/CCK_Wireless_Challenges_flashcard_download_FR.png"></a></p>
+<p><a href="/files/cck/networking/Scenarios_des_Problemes.pdf">Supports visuels : Scénario problème Feuilles</a> -Imprimés sur du papier A4.<br><a href="/files/cck/networking/Scenarios_des_Problemes.pdf"><img alt="" src="/files/CCK_Wireless_Challenges_flashcard_download_FR.png"></a></p>
+
+<p><a href="/files/cck/networking/Exemple_des_Solutions_Classeur.pdf">Supports visuels : Exemple solutions aux scénarios Problème</a> -Imprimés sur du papier A4.<br><a href="/files/cck/networking/Exemple_des_Solutions_Classeur.pdf"><img alt="" src="/files/CCK_Wireless_Challenges_flashcard_download_FR.png"></a></p>
 
 <p>(Facultatif) Les schémas de routage contenus dans le module <a href="/fr/docs/cck/planning/design-your-network-every-network-tells-story">Concevoir votre réseau : chaque réseau raconte une histoire</a>.</p>
 
@@ -48,7 +50,7 @@ lang: fr
 <p><strong>2. Comme polycopes auxquels vous vous référerez pendant votre travail.</strong> Dans ce cas, vous aurez à imprimer plusieurs exemplaires de la liste des problèmes  (en laissant, momentanément, les solutions de côté). Distribuez les supports visuels contenant la liste des problèmes et penchez-vous sur chaque problème, individuellement, en groupe, en plusieurs petits groupes ou par paires. Comparez les solutions proposées, d'abord, les unes avec les autres, puis à celles proposées dans l'exemple.  </p>
 </div>
 
-<p>Si vous traitez les difficultés inhérentes aux réseaux sans fil en groupe, vous pouvez vous servir de la <a href="/files/cck/networking/Difficultes_inherentes_aux_reseaux_sans_fil.pdf">présentation</a> afin d'introduire le concept et enchaîner avec les règles, explicitées plus bas. </p>
+<p>Si vous traitez les difficultés inhérentes aux réseaux sans fil en groupe, vous pouvez vous servir de la <a href="/files/cck/networking/Difficultes_inherentes_aux_reseaux_sans_fil_presentation.pdf">présentation</a> afin d'introduire le concept et enchaîner avec les règles, explicitées plus bas. </p>
 </section>
 <section id="what-are-the-wireless-challenges">
 <h3>Quels sont les défis auxquels sont confrontés les réseaux sans fil ?</h3>
@@ -70,7 +72,7 @@ lang: fr
 <section id="going-through-the-wireless-challenges">
 <h3>Les défis auxquels sont confrontés les réseaux sans fil</h3>
 
-<p>Si vous vous y prenez seul pour traiter les problèmes inhérents aux réseaux sans fil, vous pouvez procéder à votre propre rythme. Téléchargez la version PDF de : <a href="/files/cck/networking/Problemes_et_solutions.pdf">Problèmes et Solutions</a> et parcourez les scénarios, un à un. Rédigez les solutions aux problèmes soulevés par les scénarios et comparez-les aux exemples proposés dans les pages suivantes. Surtout pas de tricherie ! </p>
+<p>Si vous vous y prenez seul pour traiter les problèmes inhérents aux réseaux sans fil, vous pouvez procéder à votre propre rythme. Téléchargez la version PDF de : <a href="/files/cck/networking/Scenarios_des_Problemes.pdf">Problèmes</a> et <a href="/files/cck/networking/Exemple_des_Solutions_Classeur.pdf">Exemple Solutions</a> et parcourez les scénarios, un à un. Rédigez les solutions aux problèmes soulevés par les scénarios et comparez-les aux exemples proposés dans les pages suivantes. Surtout pas de tricherie ! </p>
 
 <p>Si vous travaillez en groupe, nous vous suggérons de suivre les tâches suivantes :  </p>
 
@@ -80,14 +82,14 @@ lang: fr
 	<li>Le sous-groupes inscrivent les solutions sur chaque support visuel et les gardent de côté jusqu'à ce que tout le monde ait terminé.</li>
 	<li>Suite à quoi, les groupes comparent les solutions, d'abord, les unes aux autres, puis à celles proposées dans l'exemple.</li>
 </ul>
-<p>Ayez à l'esprit qu'il existe plusieurs solutions possibles aux difficultés soulevées par ce document, qui ne propose que deux ou trois cas de figure. Si vous parvenez à une solution innovante ou si vous estimez que nous avons commis une erreur, nous vous prions de bien vouloir nous le faire savoir ! Vous pouvez nous contacter en vous servant<a href="/contact">du formulaire de feedback.</a>.</p>
+<p>Ayez à l'esprit qu'il existe plusieurs solutions possibles aux difficultés soulevées par ce document, qui ne propose que deux ou trois cas de figure. Si vous parvenez à une solution innovante ou si vous estimez que nous avons commis une erreur, nous vous prions de bien vouloir nous le faire savoir ! Vous pouvez nous contacter en vous servant <a href="/contact">du formulaire de feedback.</a>.</p>
 </section>
 <section id="rules-for-solving-the-challenges">
 <h3>Les règles à suivre pour la résolution des difficultés</h3>
 
 <p>Pour traiter les difficultés que peuvent rencontrer les réseaux sans fil, il est nécessaire de savoir comment lire les connexions entre différents nœuds et comment établir votre propre connexion. </p>
 
-<p><strong>La qualité des liaisons sans fil</strong>—Les lignes illustrent l'intensité de la liaison entre deux nœuds, selon qu'elles soient continues ou pointillées. Une ligne verte continue est synonyme de forte intensité. Une ligne jaune pointillée veut dire que la liaison est acceptable. Une ligne pointillée rouge ou rose veut dire que la liaison est mauvaise ou qu'elle a été interrompue. <br><img alt="" src="/files/CCK_Wireless_Challenges_signal_quality_rules.png"></p>
+<p><strong>La qualité des liaisons sans fil</strong>—Les lignes illustrent l'intensité de la liaison entre deux nœuds, selon qu'elles soient continues ou pointillées. Une ligne verte continue est synonyme de forte intensité. Une ligne jaune pointillée veut dire que la liaison est acceptable. Une ligne pointillée rouge ou rose veut dire que la liaison est mauvaise ou qu'elle a été interrompue. <br><img alt="" src="/files/WirelessChallenges-Rules-signal-quality.png"></p>
 
 <p><strong>L'intensité du signal sans fil</strong>—Les routeurs sont dotés de différentes intensités d'écoute et d'émission. </p>