--- a/doc/models/Makefile	Fri Oct 28 11:48:05 2011 +0200
+++ b/doc/models/Makefile	Fri Oct 28 11:48:42 2011 +0200
@@ -84,7 +84,8 @@
 	$(SRC)/lte/doc/source/figures/simulationTime.eps \
 	$(SRC)/lte/doc/source/figures/memoryUsage.eps \
 	$(SRC)/lte/doc/source/figures/fading_pedestrian.pdf \
-	$(SRC)/lte/doc/source/figures/fading_pedestrian.png \
+	$(SRC)/lte/doc/source/figures/fading_vehicular.pdf \
+	$(SRC)/lte/doc/source/figures/fading_urban_3kmph.pdf \
 	$(SRC)/uan/doc/auvmobility-classes.dia \
 	$(SRC)/stats/doc/Stat-framework-arch.png \
 	$(SRC)/stats/doc/Wifi-default.png \

--- a/src/lte/doc/source/lte-user.rst	Fri Oct 28 11:48:05 2011 +0200
+++ b/src/lte/doc/source/lte-user.rst	Fri Oct 28 11:48:42 2011 +0200
@@ -365,7 +365,7 @@
   lena->SetFadingModelAttribute ("WindowSize", TimeValue (Seconds (0.5)));
   lena->SetFadingModelAttribute ("RbNum", UintegerValue (100));
 
-It has to be noted that, ``TraceFilename`` does not have a default value, therefore is has to be always set for using the fading module in the simulator. The simulator provide natively a fading trace generated according to the pedestrian behavior defined in in Annex B.2 of [TS36.104]_ (available at ``src/lte/model/FadingTraces/fading_trace_EPA_3kmph.fad``); a sample of such trace is reported in `fig-fadingPedestrianTrace`_.
+It has to be noted that, ``TraceFilename`` does not have a default value, therefore is has to be always set for using the fading module in the simulator. The simulator provide natively three fading traces generated according to the configurations defined in in Annex B.2 of [TS36.104]_ (available in the folder ``src/lte/model/FadingTraces/``); examples of such traces are reported in `fig-fadingPedestrianTrace_`, `fig-fadingVehicularTrace_` and `fig-fadingUrbanTrace_`.
 
 
 .. _fig-fadingPedestrianTrace:
@@ -373,6 +373,20 @@
 .. figure:: figures/fading_pedestrian.*                 
    :align: center
 
-   Example of the fading trace included in the simulator.
+   Example of the fading trace included in the simulator for a pedestrian scenario (speed of 3 kmph).
+
+.. _fig-fadingVehicularTrace:
+
+.. figure:: figures/fading_vehicular.*                 
+   :align: center
+
+   Example of the fading trace included in the simulator for a vehicular  scenario (speed of 60 kmph).
+
+.. _fig-fadingUrbanTrace:
+
+.. figure:: figures/fading_urban_3kmph.*                 
+   :align: center
+
+   Example of the fading trace included in the simulator for an urban  scenario (speed of 3 kmph).
 
 

--- a/src/lte/helper/lena-helper.cc	Fri Oct 28 11:48:05 2011 +0200
+++ b/src/lte/helper/lena-helper.cc	Fri Oct 28 11:48:42 2011 +0200
@@ -100,7 +100,7 @@
       m_uplinkChannel->AddPropagationLossModel (ulPlm);
     }
     
-  if (m_fadingModelType.compare ( "ns3::TraceFadingLossModel") == 0)
+  if (m_fadingModelFactory.GetTypeId ().GetName ().compare ( "ns3::TraceFadingLossModel") == 0)
     {
       m_fadingModule = m_fadingModelFactory.Create<TraceFadingLossModel> ();
       m_downlinkChannel->AddSpectrumPropagationLossModel (m_fadingModule);
@@ -393,7 +393,7 @@
   Ptr<LteUePhy> uePhy = ueDevice->GetObject<LteUeNetDevice> ()->GetPhy ();
   enbPhy->AddUePhy (rnti, uePhy);
   
-  if (m_fadingModelType.compare ( "ns3::TraceFadingLossModel") == 0)
+  if (m_fadingModelFactory.GetTypeId ().GetName ().compare ( "ns3::TraceFadingLossModel") == 0)
     {
        Ptr<MobilityModel> mm_enb_dl = enbPhy->GetDownlinkSpectrumPhy ()->GetMobility ()->GetObject<MobilityModel> ();
        Ptr<MobilityModel> mm_ue_ul = uePhy->GetUplinkSpectrumPhy ()->GetMobility ()->GetObject<MobilityModel> ();