diff --git a/trunk/siprp/SIPRPTracker.java b/trunk/siprp/SIPRPTracker.java
index 69be4025..e452bb41 100644
--- a/trunk/siprp/SIPRPTracker.java
+++ b/trunk/siprp/SIPRPTracker.java
@@ -39,6 +39,7 @@ public class SIPRPTracker extends WindowTracker
 	private final AvisosPanel avisos;
 	private ClientesWindow clientesWindow;
 	private MedicinaWindow medicinaWindow;
+	private MarcacoesHigieneWindow higieneWindow;
 	
 	/** Creates a new instance of SIPRPTracker */
 	public SIPRPTracker( AvisosPanel avisosP )
@@ -59,12 +60,15 @@ public class SIPRPTracker extends WindowTracker
 			try
 			{
 				clientesWindow = new ClientesWindow( avisos );
+				clientesWindow.setTracker( this );
 				medicinaWindow = new MedicinaWindow();
+				higieneWindow = new MarcacoesHigieneWindow();
 			}
 			catch( Exception ex )
 			{
 				clientesWindow = null;
 				medicinaWindow = null;
+				higieneWindow = null;
 				ex.printStackTrace();
 			}
 		}
@@ -109,6 +113,7 @@ public class SIPRPTracker extends WindowTracker
 						if( clientesWindow == null )
 						{
 							clientesWindow = new ClientesWindow( avisos );
+							clientesWindow.setTracker( SIPRPTracker.this );
 						}
 						return clientesWindow;
 					}
@@ -134,7 +139,11 @@ public class SIPRPTracker extends WindowTracker
 					public TrackableWindow create()
 						throws Exception
 					{
-						return new MarcacoesHigieneWindow();
+						if( higieneWindow == null )
+						{
+							higieneWindow = new MarcacoesHigieneWindow();
+						}
+						return higieneWindow;
 					}
 				} );
 				
@@ -181,4 +190,14 @@ public class SIPRPTracker extends WindowTracker
 	{
 		return clientesWindow;
 	}
+	
+	public MedicinaWindow getMedicinaWindow()
+	{
+		return medicinaWindow;
+	}
+	
+	public MarcacoesHigieneWindow getHigieneWindow()
+	{
+		return higieneWindow;
+	}
 }