diff --git a/Trunk/MonoGameView/map2.xml b/Trunk/MonoGameView/map2.xml
index d632bdf..a60ee6a 100644
--- a/Trunk/MonoGameView/map2.xml
+++ b/Trunk/MonoGameView/map2.xml
@@ -174,20 +174,6 @@
 						100
 					</Volume>
 				</Can>
-				<Can>
-					<GarbageType>
-						Organic
-					</GarbageType>
-					<Density>
-						1
-					</Density>
-					<ProcessingTimePerUnit>
-						1
-					</ProcessingTimePerUnit>
-					<Volume>
-						100
-					</Volume>
-				</Can>
 				<Can>
 					<GarbageType>
 						Paper
@@ -216,6 +202,20 @@
 						100
 					</Volume>
 				</Can>
+				<Can>
+					<GarbageType>
+						Organic
+					</GarbageType>
+					<Density>
+						1
+					</Density>
+					<ProcessingTimePerUnit>
+						1
+					</ProcessingTimePerUnit>
+					<Volume>
+						100
+					</Volume>
+				</Can>
 			</TrashCans>
 		</Object>
 		<Object>
@@ -324,20 +324,6 @@
 					</Volume>
 				</Can>
 								<Can>
-					<GarbageType>
-						Organic
-					</GarbageType>
-					<Density>
-						1
-					</Density>
-					<ProcessingTimePerUnit>
-						1
-					</ProcessingTimePerUnit>
-					<Volume>
-						100
-					</Volume>
-				</Can>
-				<Can>
 					<GarbageType>
 						Paper
 					</GarbageType>
@@ -365,6 +351,20 @@
 						100
 					</Volume>
 				</Can>
+				<Can>
+					<GarbageType>
+						Organic
+					</GarbageType>
+					<Density>
+						1
+					</Density>
+					<ProcessingTimePerUnit>
+						1
+					</ProcessingTimePerUnit>
+					<Volume>
+						100
+					</Volume>
+				</Can>
 			</TrashCans>
 		</Object>
 		<Object>
@@ -733,7 +733,7 @@
 			</Position>
 			<Garbage>
 				<GarbageType>
-					Glass
+					Organic
 				</GarbageType>
 				<Density>
 					1
@@ -864,7 +864,7 @@
 			</Position>
 			<Garbage>
 				<GarbageType>
-					Glass
+					Paper
 				</GarbageType>
 				<Density>
 					1
@@ -891,7 +891,7 @@
 			</Position>
 			<Garbage>
 				<GarbageType>
-					Glass
+					PlasticMetal
 				</GarbageType>
 				<Density>
 					1
@@ -1257,20 +1257,6 @@
 					</Volume>
 				</Can>
 								<Can>
-					<GarbageType>
-						Organic
-					</GarbageType>
-					<Density>
-						1
-					</Density>
-					<ProcessingTimePerUnit>
-						1
-					</ProcessingTimePerUnit>
-					<Volume>
-						100
-					</Volume>
-				</Can>
-				<Can>
 					<GarbageType>
 						Paper
 					</GarbageType>
@@ -1298,6 +1284,20 @@
 						100
 					</Volume>
 				</Can>
+				<Can>
+					<GarbageType>
+						Organic
+					</GarbageType>
+					<Density>
+						1
+					</Density>
+					<ProcessingTimePerUnit>
+						1
+					</ProcessingTimePerUnit>
+					<Volume>
+						100
+					</Volume>
+				</Can>
 			</TrashCans>
 		</Object>
 		<Object>
@@ -1406,20 +1406,6 @@
 					</Volume>
 				</Can>
 								<Can>
-					<GarbageType>
-						Organic
-					</GarbageType>
-					<Density>
-						1
-					</Density>
-					<ProcessingTimePerUnit>
-						1
-					</ProcessingTimePerUnit>
-					<Volume>
-						100
-					</Volume>
-				</Can>
-				<Can>
 					<GarbageType>
 						Paper
 					</GarbageType>
@@ -1447,6 +1433,20 @@
 						100
 					</Volume>
 				</Can>
+				<Can>
+					<GarbageType>
+						Organic
+					</GarbageType>
+					<Density>
+						1
+					</Density>
+					<ProcessingTimePerUnit>
+						1
+					</ProcessingTimePerUnit>
+					<Volume>
+						100
+					</Volume>
+				</Can>
 			</TrashCans>
 		</Object>
 		<Object>