diff --git a/monitoring/nagios3/commands.cfg b/monitoring/nagios3/commands.cfg
index a16bf7b..f7c3388 100644
--- a/monitoring/nagios3/commands.cfg
+++ b/monitoring/nagios3/commands.cfg
@@ -55,6 +55,12 @@ define command {
 	command_line	/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -P 2c -C $USER3$ -o $ARG1$ $ARG2$ $ARG3$
 }
 
+###### custom snmp commands ######
+define command {
+	command_name	check_snmp_cisco_new
+	command_line	/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -P 2c -C $USER5$ -o $ARG1$ $ARG2$ $ARG3$
+}
+
 define command {
 	command_name check_stream_count
 	command_line /usr/local/bin/count-streams.sh $ARG1$ $ARG2$
@@ -100,7 +106,7 @@ define command {
 # for unbound
 define command {
 	command_name	custom_check_dns
-	command_line	/usr/lib/nagios/plugins/check_dns -H openfest.org -s $HOSTADDRESS$ -a 79.98.105.21
+	command_line	/usr/lib/nagios/plugins/check_dns -H openfest.org -s $HOSTADDRESS$ -a 185.117.82.69
 }
 
 # check dynamic interface status
@@ -114,7 +120,10 @@ define command {
 	command_name	check_uptime_snmp
 	command_line	/etc/nagios3/commands/check_uptime_snmp.pl -H $HOSTADDRESS$ -2 -C $USER3$ $ARG1$ $ARG2$ $ARG3$
 }
-
+define command {
+	command_name	check_uptime_snmp_new
+	command_line	/etc/nagios3/commands/check_uptime_snmp.pl -H $HOSTADDRESS$ -2 -C $USER5$ $ARG1$ $ARG2$ $ARG3$
+}
 # check dynamic interface status
 define command {
 	command_name	check_ifstat_snmp_ap
diff --git a/monitoring/nagios3/conf.d/99-cisco-services.cfg b/monitoring/nagios3/conf.d/99-cisco-services.cfg
index b264f3a..22d0a26 100644
--- a/monitoring/nagios3/conf.d/99-cisco-services.cfg
+++ b/monitoring/nagios3/conf.d/99-cisco-services.cfg
@@ -3,49 +3,19 @@ define service {
 	service_description	Switch uptime
 	check_interval		5
 	check_command		check_uptime_snmp!-T win!-w 20 -c 5
-	hostgroup	cisco-switches,tplink-switches
+	hostgroup	cisco-coreswitches
 }
-
 define service {
-	name SNMP_TRAP
-	service_description SNMP_TRAP
-active_checks_enabled           1       ; Active service checks are enabled
-passive_checks_enabled          1       ; Passive service checks are enabled/accepted
-parallelize_check               1       ; Active service checks should be parallelized
-process_perf_data               0
-obsess_over_service             0       ; We should obsess over this service (if necessary)
-check_freshness                 0       ; Default is to NOT check service 'freshness'
-notifications_enabled           1       ; Service notifications are enabled
-event_handler_enabled           1       ; Service event handler is enabled
-flap_detection_enabled          1       ; Flap detection is enabled
-process_perf_data               1       ; Process performance data
-retain_status_information       1       ; Retain status information across program restarts
-retain_nonstatus_information    1       ; Retain non-status information across program restarts
-check_command                   check-host-alive      ; This will be used to reset the service to "OK"
-is_volatile                     1
-check_period                    24x7
-max_check_attempts              1
-normal_check_interval           1
-retry_check_interval            1
-notification_interval           120
-notification_period             24x7
-notification_options            w,u,c,r
-contact_groups                  ofnoc       ; Modify this to match your Nagios contact group definitions
-register
+	use			generic-service
+	service_description	Switch uptime
+	check_interval		5
+	check_command		check_uptime_snmp_new!-T win!-w 20 -c 5
+	hostgroup		cisco-nocswiches,tplink-switches
 }
-
-; define service {
-;	use SNMP_TRAP
-;	hostgroup_name cisco-switches,tplink-switches
-;	service_description TRAP
-;	check_interval 120
-;	flap_detection_enabled	0
-;}
-
 ; Cisco IOS CPU Avg
 define service {
 use                     generic-service
-hostgroup               cisco-switches
+hostgroup               cisco-coreswitches
 service_description     5 Min CPU Average
 check_interval          5
 check_command           check_snmp_cisco!.1.3.6.1.4.1.9.9.109.1.1.1.1.8.1!-l \"5 Minute CPU \% \" -w 50 -c 80
@@ -53,8 +23,24 @@ check_command           check_snmp_cisco!.1.3.6.1.4.1.9.9.109.1.1.1.1.8.1!-l \"5
 
 define service {
 use                     generic-service
-hostgroup               cisco-switches
+hostgroup               cisco-coreswitches
 service_description     1 Min CPU Average
 check_interval          1
 check_command           check_snmp_cisco!.1.3.6.1.4.1.9.9.109.1.1.1.1.7.1!-l \"1 Minute CPU \% \" -w 50 -c 80
 }
+
+define service {
+use                     generic-service
+hostgroup               cisco-nocswiches
+service_description     5 Min CPU Average NOC
+check_interval          5
+check_command           check_snmp_cisco_new!.1.3.6.1.4.1.9.9.109.1.1.1.1.8.1!-l \"5 Minute CPU \% \" -w 50 -c 80
+}
+
+define service {
+use                     generic-service
+hostgroup               cisco-nocswiches
+service_description     1 Min CPU Average NOC
+check_interval          1
+check_command           check_snmp_cisco_new!.1.3.6.1.4.1.9.9.109.1.1.1.1.7.1!-l \"1 Minute CPU \% \" -w 50 -c 80
+}
diff --git a/monitoring/nagios3/conf.d/extinfo_nagios2.cfg b/monitoring/nagios3/conf.d/extinfo_nagios2.cfg
index cc9306e..e191b32 100644
--- a/monitoring/nagios3/conf.d/extinfo_nagios2.cfg
+++ b/monitoring/nagios3/conf.d/extinfo_nagios2.cfg
@@ -75,14 +75,14 @@ define hostextinfo {
 	statusmap_image	custom/video/atem-switch.gd2
 }
 
-define hostextinfo {
-        hostgroup_name  intercom-group
-        notes           RPI intercom clients
-        icon_image      custom/raspberry/raspbian.png
-        icon_image_alt  RPI intercom
-        vrml_image      custom/raspberry/raspbian.png
-        statusmap_image custom/raspberry/raspbian.gd2
-}
+#define hostextinfo {
+#        hostgroup_name  intercom-group
+#        notes           RPI intercom clients
+#        icon_image      custom/raspberry/raspbian.png
+#        icon_image_alt  RPI intercom
+#        vrml_image      custom/raspberry/raspbian.png
+#        statusmap_image custom/raspberry/raspbian.gd2
+#}
 
 define hostextinfo {
         hostgroup_name  laptop-group
@@ -92,3 +92,12 @@ define hostextinfo {
         vrml_image      custom/video/control-laptop.png
         statusmap_image custom/video/control-laptop.gd2
 }
+
+#define hostextinfo {
+#	hostgroup_name	printer-group
+#	notes		Printer
+#	icon_image	printer.png
+#	icon_image_alt	Printer
+#	vrml_image	printer.png
+#	statusmap_image	printer.gd2
+#}
diff --git a/monitoring/nagios3/conf.d/hostgroups_nagios2.cfg b/monitoring/nagios3/conf.d/hostgroups_nagios2.cfg
index 7b2866b..68d37eb 100644
--- a/monitoring/nagios3/conf.d/hostgroups_nagios2.cfg
+++ b/monitoring/nagios3/conf.d/hostgroups_nagios2.cfg
@@ -37,19 +37,23 @@ define hostgroup {
 }
 
 define hostgroup {
-	hostgroup_name cisco-switches
+	hostgroup_name cisco-coreswitches
 	alias	CISCO Switches
 }
 
+define hostgroup {
+	hostgroup_name cisco-nocswiches
+	alias	NOC Switches
+}
 define hostgroup {
 	hostgroup_name tplink-switches
 	alias TPLink Switches
 }
 
-define hostgroup {
-	hostgroup_name	intercom-group
-	alias		Video Team Intercoms
-}
+#define hostgroup {
+#	hostgroup_name	intercom-group
+#	alias		Video Team Intercoms
+#}
 
 define hostgroup {
 	hostgroup_name	overflow-group
@@ -90,3 +94,13 @@ define hostgroup {
 	hostgroup_name	laptop-group
 	alias		General group for laptops
 }
+
+#define hostgroup {
+#	hostgroup_name	printer-group
+#	alias		Printers
+#}
+
+define hostgroup {
+	hostgroup_name	phones-group
+	alias		Phones
+}
diff --git a/monitoring/nagios3/nagios.cfg b/monitoring/nagios3/nagios.cfg
index 7414ccf..2b8f023 100644
--- a/monitoring/nagios3/nagios.cfg
+++ b/monitoring/nagios3/nagios.cfg
@@ -117,7 +117,7 @@ status_file=/var/cache/nagios3/status.dat
 # Nagios will periodically dump program, host, and 
 # service status data.
 
-status_update_interval=60
+status_update_interval=10
 
 
 
@@ -593,8 +593,7 @@ auto_rescheduling_interval=30
 # WARNING: THIS IS AN EXPERIMENTAL FEATURE - IT CAN DEGRADE
 # PERFORMANCE, RATHER THAN INCREASE IT, IF USED IMPROPERLY
 
-auto_rescheduling_window=180
-
+auto_rescheduling_window=60
 
 
 # SLEEP TIME
@@ -811,7 +810,7 @@ accept_passive_host_checks=1
 # service notifications when it is initially (re)started.
 # Values: 1 = enable notifications, 0 = disable notifications
 
-enable_notifications=0
+enable_notifications=1
 
 
 
diff --git a/monitoring/nagios3/objects/hosts/encoder.cfg b/monitoring/nagios3/objects/hosts/encoder.cfg
deleted file mode 100644
index dc87a23..0000000
--- a/monitoring/nagios3/objects/hosts/encoder.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-# A simple configuration file for monitoring the local host
-# This can serve as an example for configuring other servers;
-# Custom services specific to this host are added here, but services
-# defined in nagios2-common_services.cfg may also apply.
-# 
-
-define host{
-        use                     generic-host            ; Name of host template to use
-        host_name               encoder
-        alias                   encoder
-        address                 10.23.0.101
-	hostgroups		ssh-servers,debian-servers
-	parents			coresw
-}
diff --git a/monitoring/nagios3/objects/hosts/eric.cfg b/monitoring/nagios3/objects/hosts/eric.cfg
index 05fa4dd..5c5d058 100644
--- a/monitoring/nagios3/objects/hosts/eric.cfg
+++ b/monitoring/nagios3/objects/hosts/eric.cfg
@@ -65,70 +65,9 @@ define service {
 	use	generic-service
 	host_name	eric
 	service_description	Stream Count
-	check_command	check_stream_count!5!3
+	check_command	check_stream_count!2!4
 }
 
-;# Bulgaria - hd
-; moved to separate host
-;define service {
-;	use			generic-service
-;	host_name		eric
-;	service_description	Bulgaria HD stream / ERIC
-;	check_command		check_rtmp!rtmp://127.0.0.1/st/bulgaria-hd
-;}
-;define service {
-;	use			generic-service
-;	host_name		eric
-;	service_description	Bulgaria HD stream / MARLA
-;	check_command		check_rtmp!rtmp://79.98.105.21/st/bulgaria-hd
-;}
-;define service {
-;	use			generic-service
-;	host_name		eric
-;	service_description	Bulgaria HD stream / HAWK
-;	check_command		check_rtmp!rtmp://79.124.31.206/st/bulgaria-hd
-;}
-;
-;# Bulgaria SD
-;define service {
-;	use			generic-service
-;	host_name		eric
-;	service_description	Bulgaria stream / ERIC
-;	check_command		check_rtmp!rtmp://127.0.0.1/st/bulgaria
-;}
-;define service {
-;	use			generic-service
-;	host_name		eric
-;	service_description	Bulgaria stream / MARLA
-;	check_command		check_rtmp!rtmp://79.98.105.21/st/bulgaria
-;}
-;define service {
-;	use			generic-service
-;	host_name		eric
-;	service_description	Bulgaria stream / HAWK
-;	check_command		check_rtmp!rtmp://79.124.31.206/st/bulgaria
-;}
-;
-;# Chambler SD
-;define service {
-;	use			generic-service
-;	host_name		eric
-;	service_description	CHAMBER stream / ERIC
-;	check_command		check_rtmp!rtmp://127.0.0.1/st/chamber
-;}
-;define service {
-;	use			generic-service
-;	host_name		eric
-;	service_description	CHAMBER stream / MARLA
-;	check_command		check_rtmp!rtmp://79.98.105.21/st/chamber
-;}
-;define service {
-;	use			generic-service
-;	host_name		eric
-;	service_description	CHAMBER stream / HAWK
-;	check_command		check_rtmp!rtmp://79.124.31.206/st/chamber
-;}
-
 # Grafana
 define service {
 	use			generic-service
diff --git a/monitoring/nagios3/objects/hosts/streamers.cfg b/monitoring/nagios3/objects/hosts/streamers.cfg
index e26767d..5320242 100644
--- a/monitoring/nagios3/objects/hosts/streamers.cfg
+++ b/monitoring/nagios3/objects/hosts/streamers.cfg
@@ -11,65 +11,65 @@ define service {
 	use	generic-service
 	host_name	streamers
 	service_description	Stream Count
-	check_command	check_stream_count!4!2
+	check_command	check_stream_count!2!4
 }
 
-# Bulgaria - hd
+# Main Room - hd
 define service {
 	use			generic-service
 	host_name		streamers
-	service_description	Bulgaria HD stream / ERIC
-	check_command		check_rtmp!rtmp://127.0.0.1/st/r1-hd
-}
-define service {
-	use			generic-service
-	host_name		streamers
-	service_description	Bulgaria HD stream / MARLA
-	check_command		check_rtmp!rtmp://79.98.105.21/st/r1-hd
-}
-define service {
-	use			generic-service
-	host_name		streamers
-	service_description	Bulgaria HD stream / HAWK
-	check_command		check_rtmp!rtmp://79.124.31.206/st/r1-hd
+	service_description	Main Room stream / ERIC
+	check_command		check_rtmp!rtmp://127.0.0.1/st/bigroom-orig
 }
 
-# Bulgaria SD
+#define service {
+#	use			generic-service
+#	host_name		streamers
+#	service_description	Main Room HD stream / MARLA
+#	check_command		check_rtmp!rtmp://stream.openfest.org/st/bigroom-hd
+##	check_command		check_rtmp!rtmp://79.98.105.21/st/r1-hd
+#}
+
 define service {
 	use			generic-service
 	host_name		streamers
-	service_description	Bulgaria stream / ERIC
-	check_command		check_rtmp!rtmp://127.0.0.1/st/r1
+	service_description	Main Room stream / MARLA
+	check_command		check_rtmp!rtmp://stream.openfest.org/st/bigroom
+
 }
 define service {
 	use			generic-service
 	host_name		streamers
-	service_description	Bulgaria stream / MARLA
-	check_command		check_rtmp!rtmp://79.98.105.21/st/r1
-}
-define service {
-	use			generic-service
-	host_name		streamers
-	service_description	Bulgaria stream / HAWK
-	check_command		check_rtmp!rtmp://79.124.31.206/st/r1
+	service_description	Main Room Low stream / MARLA
+	check_command		check_rtmp!rtmp://stream.openfest.org/st/bigroom-low
 }
 
-# Chambler SD
+
+# Main Room SD
 define service {
 	use			generic-service
 	host_name		streamers
-	service_description	CHAMBER stream / ERIC
-	check_command		check_rtmp!rtmp://127.0.0.1/st/r2
+	service_description	Small Room stream / ERIC
+	check_command		check_rtmp!rtmp://127.0.0.1/st/smallroom-orig
+}
+
+## Chambler SD
+#define service {
+#	use			generic-service
+#	host_name		streamers
+#	service_description	Second Room stream / ERIC
+#	check_command		check_rtmp!rtmp://127.0.0.1/st/r2
+#}
+
+define service {
+	use			generic-service
+	host_name		streamers
+	service_description	Small Room stream / MARLA
+	check_command		check_rtmp!rtmp://stream.openfest.org/st/smallroom
 }
 define service {
 	use			generic-service
 	host_name		streamers
-	service_description	CHAMBER stream / MARLA
-	check_command		check_rtmp!rtmp://79.98.105.21/st/r2
-}
-define service {
-	use			generic-service
-	host_name		streamers
-	service_description	CHAMBER stream / HAWK
-	check_command		check_rtmp!rtmp://79.124.31.206/st/r2
+	service_description	Small Room Low stream / MARLA
+	check_command		check_rtmp!rtmp://stream.openfest.org/st/smallroom-low
 }
diff --git a/monitoring/nagios3/objects/overflow/01-overflow-tv.cfg b/monitoring/nagios3/objects/overflow/01-overflow-tv-1.cfg
similarity index 57%
rename from monitoring/nagios3/objects/overflow/01-overflow-tv.cfg
rename to monitoring/nagios3/objects/overflow/01-overflow-tv-1.cfg
index 7a66cd7..3ea5015 100644
--- a/monitoring/nagios3/objects/overflow/01-overflow-tv.cfg
+++ b/monitoring/nagios3/objects/overflow/01-overflow-tv-1.cfg
@@ -1,8 +1,8 @@
 define host {
-	host_name	overflow-tv
+	host_name	overflow-tv-1
 	use		generic-host
-	alias		overflow-tv
-	address		10.24.0.11
+	alias		overflow-tv-1
+	address		10.24.0.15
 	hostgroups	overflow-group,ssh-servers
 	parents		coresw
 }
diff --git a/monitoring/nagios3/objects/phones/01-noc.cfg b/monitoring/nagios3/objects/phones/01-noc.cfg
new file mode 100644
index 0000000..296c009
--- /dev/null
+++ b/monitoring/nagios3/objects/phones/01-noc.cfg
@@ -0,0 +1,8 @@
+define host {
+	host_name	phone-noc1
+	use		generic-host
+	alias		phone-noc1
+	address		10.25.0.10
+	hostgroups	phones-group
+	parents		nocsw
+}
diff --git a/monitoring/nagios3/objects/phones/02-reception.cfg b/monitoring/nagios3/objects/phones/02-reception.cfg
new file mode 100644
index 0000000..5af0781
--- /dev/null
+++ b/monitoring/nagios3/objects/phones/02-reception.cfg
@@ -0,0 +1,8 @@
+define host {
+	host_name	phone-reception
+	use		generic-host
+	alias		phone-reception
+	address		10.25.0.11
+	hostgroups	phones-group
+	parents		receptionsw
+}
diff --git a/monitoring/nagios3/objects/phones/03-teamroom.cfg b/monitoring/nagios3/objects/phones/03-teamroom.cfg
new file mode 100644
index 0000000..2a10a1f
--- /dev/null
+++ b/monitoring/nagios3/objects/phones/03-teamroom.cfg
@@ -0,0 +1,8 @@
+define host {
+	host_name	phone-teamroom
+	use		generic-host
+	alias		phone-teamroom
+	address		10.25.0.13
+	hostgroups	phones-group
+	parents		coresw
+}
diff --git a/monitoring/nagios3/objects/phones/04-video-smallroom.cfg b/monitoring/nagios3/objects/phones/04-video-smallroom.cfg
new file mode 100644
index 0000000..b09e3e9
--- /dev/null
+++ b/monitoring/nagios3/objects/phones/04-video-smallroom.cfg
@@ -0,0 +1,8 @@
+define host {
+	host_name	phone-smallroom
+	use		generic-host
+	alias		phone-smallroom
+	address		10.25.0.20
+	hostgroups	phones-group
+	parents		srvocsw
+}
diff --git a/monitoring/nagios3/objects/phones/05-video-bigroom.cfg b/monitoring/nagios3/objects/phones/05-video-bigroom.cfg
new file mode 100644
index 0000000..fbe1254
--- /dev/null
+++ b/monitoring/nagios3/objects/phones/05-video-bigroom.cfg
@@ -0,0 +1,8 @@
+define host {
+	host_name	phone-bigroom
+	use		generic-host
+	alias		phone-bigroom
+	address		10.25.0.21
+	hostgroups	phones-group
+	parents		mrvocsw
+}
diff --git a/monitoring/nagios3/objects/reception/01-laptop.cfg b/monitoring/nagios3/objects/reception/01-laptop.cfg
index 4bea8e2..547575b 100644
--- a/monitoring/nagios3/objects/reception/01-laptop.cfg
+++ b/monitoring/nagios3/objects/reception/01-laptop.cfg
@@ -2,7 +2,7 @@ define host {
 	host_name	reception-laptop
 	use		generic-host
 	alias		reception-laptop
-	address		10.21.0.51
+	address		10.21.1.42
 	hostgroups	reception-equipment,laptop-group
 	parents		receptionsw
 }
diff --git a/monitoring/nagios3/objects/switch/00-core-uplink.cfg b/monitoring/nagios3/objects/switch/00-core-uplink.cfg
new file mode 100644
index 0000000..4799294
--- /dev/null
+++ b/monitoring/nagios3/objects/switch/00-core-uplink.cfg
@@ -0,0 +1,79 @@
+define host {
+	host_name	uplinksw
+	use		generic-host
+	alias		uplinksw
+	address		172.31.42.64
+	hostgroups	core-switches,tplink-switches
+	parents		eric
+}
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 uplinksw 
+ 	 service_description 	 Gi1/0/01 - UNUSED
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.1!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 uplinksw 
+ 	 service_description 	 Gi1/0/02 - UNUSED
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.2!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service
+ 	 hosts 	 	 	 uplinksw 
+ 	 service_description 	 Gi1/0/03 - UNUSED
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.3!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 uplinksw 
+ 	 service_description 	 Gi1/0/04 - UNUSED
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.4!-r 2!-l ifOperStatus
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 uplinksw 
+ 	 service_description 	 Gi1/0/05 - UNUSED
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.5!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 uplinksw 
+ 	 service_description 	 Gi1/0/06 - UNUSED
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.6!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 uplinksw 
+ 	 service_description 	 Gi1/0/07 - UNUSED
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.7!-r 2!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 uplinksw 
+ 	 service_description 	 Gi1/0/08 - UNUSED
+	 check_command		 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.8!-r 2!-l ifOperStatus
+	 notifications_enabled 0
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 uplinksw 
+ 	 service_description 	 Gi1/0/09 - ipacct
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.9!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service 
+ 	 hosts 	 	 	 uplinksw 
+ 	 service_description 	 Gi1/0/10 - techpark
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10!-r 1!-l ifOperStatus 
+ 	 } 
diff --git a/monitoring/nagios3/objects/switch/01-core-coresw.cfg b/monitoring/nagios3/objects/switch/01-core-coresw.cfg
index c2d2eed..5f7867e 100644
--- a/monitoring/nagios3/objects/switch/01-core-coresw.cfg
+++ b/monitoring/nagios3/objects/switch/01-core-coresw.cfg
@@ -3,7 +3,7 @@ define host {
 	use		generic-host
 	alias		coresw
 	address		10.20.0.11
-	hostgroups	cisco-switches,core-switches
+	hostgroups	cisco-coreswitches,core-switches
 	parents		eric
 }
 
@@ -20,3 +20,388 @@ define service {
          service_description     Vlan20
          check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.20!-r 1!-l ifOperStatus
 }
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/01 - mrvocsw
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10101!-r 1!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/02 - srvocsw
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10102!-r 1!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/03 - receptionsw
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10103!-r 1!-l ifOperStatus
+}
+
+#define service {
+#         use                     generic-service
+#         hosts                   coresw
+#         service_description     Gi0/04 - nocsw
+#         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10104!-r 1!-l ifOperStatus
+#}
+#
+#define service {
+#         use                     generic-service
+#         hosts                   coresw
+#         service_description     Gi0/05 - wssw1
+#         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10105!-r 1!-l ifOperStatus
+#}
+#
+#define service {
+#         use                     generic-service
+#         hosts                   coresw
+#         service_description     Gi0/06 - wssw2
+#         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10106!-r 1!-l ifOperStatus
+#}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/07 - presenter-mr
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10107!-r " (1|2)$"!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/08 - presenter-sr
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10108!-r " (1|2)$"!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/09 - UPLINK
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10109!-r 1!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/10 - UPLINK
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10110!-r 1!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/11 - WIFI-AP
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10111!-r 1!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/12 - WIFI-AP
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10112!-r 1!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/13 - WIFI-AP
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10113!-r 1!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/14 - WIFI-AP
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10114!-r 1!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/15 - WIFI-AP
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10115!-r 1!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/16 - WIFI-AP
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10116!-r 1!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/17 - OVERFLOW
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10117!-r 1!-l ifOperStatus
+}
+
+#define service {
+#         use                     generic-service
+#         hosts                   coresw
+#         service_description     Gi0/18 - OVERFLOW
+#         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10118!-r 1!-l ifOperStatus
+#}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/19
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10119!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/20
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10120!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/21
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10121!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/22
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10122!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/23
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10123!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/24
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10124!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/25
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10125!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/26 - TEAM ROOM PHONE
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10126!-r 1!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/27
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10127!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/28
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10128!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/29
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10129!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/30
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10130!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/31
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10131!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/32
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10132!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/33
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10133!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/34
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10134!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/35
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10135!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/36
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10136!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/37
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10137!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/38
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10138!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/39
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10139!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/40
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10140!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/41
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10141!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/42
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10142!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/43
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10143!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/44 - encoder
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10144!-r 1!-l ifOperStatus
+}
+
+#define service {
+#         use                     generic-service
+#         hosts                   coresw
+#         service_description     Gi0/45 - eric/standby
+#         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10145!-r 1!-l ifOperStatus
+#}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/46 - eric
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10146!-r 1!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/47 - UPLINK/SPARE
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10147!-r " (1|2)$"!-l ifOperStatus
+}
+
+#define service {
+#         use                     generic-service
+#         hosts                   coresw
+#         service_description     Gi0/48 - UPLINK
+#         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10148!-r 1!-l ifOperStatus
+#}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/49
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10149!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/50
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10150!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/51
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10151!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Gi0/52
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10152!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     TenGi0/1
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10201!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     TenGi0/2
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10202!-r 2!-l ifOperStatus
+}
+
+define service {
+         use                     generic-service
+         hosts                   coresw
+         service_description     Fe0
+         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10502!-r 2!-l ifOperStatus
+}
diff --git a/monitoring/nagios3/objects/switch/02-core-mr-vocsw.cfg b/monitoring/nagios3/objects/switch/02-core-mr-vocsw.cfg
index 56456d1..5de4efa 100644
--- a/monitoring/nagios3/objects/switch/02-core-mr-vocsw.cfg
+++ b/monitoring/nagios3/objects/switch/02-core-mr-vocsw.cfg
@@ -10,57 +10,57 @@ define host {
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 mrvocsw 
- 	 service_description 	 Gi1/0/01 - coresw
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.1!-r 1!-l ifOperStatus 
+ 	 service_description 	 Gi1/0/01 - phone
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.1!-r 1!-l ifOperStatus 
  	 } 
 
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 mrvocsw 
- 	 service_description 	 Gi1/0/02 - UNUSED
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.2!-r 2!-l ifOperStatus 
+ 	 service_description 	 Gi1/0/02 - TERADECK
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.2!-r 1!-l ifOperStatus 
+ 	 } 
+
+define service { 
+ 	 use 	 	 	 generic-service
+ 	 hosts 	 	 	 mrvocsw 
+ 	 service_description 	 Gi1/0/03 - videoswitcher
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.3!-r 1!-l ifOperStatus 
  	 } 
 
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 mrvocsw 
- 	 service_description 	 Gi1/0/03 - UNUSED
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.3!-r 2!-l ifOperStatus 
+ 	 service_description 	 Gi1/0/04 - control/1
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.4!-r " (1|2)$"!-l ifOperStatus
  	 } 
 
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 mrvocsw 
- 	 service_description 	 Gi1/0/04 - UNUSED
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.4!-r 2!-l ifOperStatus
+ 	 service_description 	 Gi1/0/05 - control/2
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.5!-r " (1|2)$"!-l ifOperStatus 
  	 } 
 
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 mrvocsw 
- 	 service_description 	 Gi1/0/05 - AP1
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.5!-r 1!-l ifOperStatus 
+ 	 service_description 	 Gi1/0/06 - intercom/1
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.6!-r " (1|2)$"!-l ifOperStatus 
  	 } 
 
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 mrvocsw 
- 	 service_description 	 Gi1/0/06 - UNUSED
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.6!-r 2!-l ifOperStatus 
+ 	 service_description 	 Gi1/0/07 - intercom/2
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.7!-r " (1|2)$"!-l ifOperStatus 
  	 } 
 
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 mrvocsw 
- 	 service_description 	 Gi1/0/07 - unused
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.7!-r 2!-l ifOperStatus 
- 	 } 
-
-define service { 
- 	 use 	 	 	 generic-service 
- 	 hosts 	 	 	 mrvocsw 
- 	 service_description 	 Gi1/0/08 - UNUSED
-	 check_command		 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.8!-r 2!-l ifOperStatus
+ 	 service_description 	 Gi1/0/08 - UPLINK
+	 check_command		 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.8!-r 1!-l ifOperStatus
 	 notifications_enabled 0
  	 } 
 
@@ -68,19 +68,19 @@ define service {
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 mrvocsw 
  	 service_description 	 Gi1/0/09 - UNUSED
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.9!-r 2!-l ifOperStatus 
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.9!-r 2!-l ifOperStatus 
  	 } 
 
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 mrvocsw 
  	 service_description 	 Gi1/0/10 - UNUSED
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10!-r 2!-l ifOperStatus 
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10!-r 2!-l ifOperStatus 
  	 } 
 
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 mrvocsw 
  	 service_description 	 Vlan20
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.52802!-r 1!-l ifOperStatus 
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.52802!-r 1!-l ifOperStatus 
 }
diff --git a/monitoring/nagios3/objects/switch/03-core-sr-vocsw.cfg b/monitoring/nagios3/objects/switch/03-core-sr-vocsw.cfg
index 636b2eb..c2536dc 100644
--- a/monitoring/nagios3/objects/switch/03-core-sr-vocsw.cfg
+++ b/monitoring/nagios3/objects/switch/03-core-sr-vocsw.cfg
@@ -10,57 +10,57 @@ define host {
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 srvocsw 
- 	 service_description 	 Gi1/0/01 - coresw
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.1!-r 1!-l ifOperStatus 
+ 	 service_description 	 Gi1/0/01 - phone
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.1!-r 1!-l ifOperStatus 
  	 } 
 
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 srvocsw 
- 	 service_description 	 Gi1/0/02 - UNUSED
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.2!-r 2!-l ifOperStatus 
+ 	 service_description 	 Gi1/0/02 - TERADECK
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.2!-r 1!-l ifOperStatus 
  	 } 
 
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 srvocsw 
- 	 service_description 	 Gi1/0/03 - UNUSED
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.3!-r 2!-l ifOperStatus 
+ 	 service_description 	 Gi1/0/03 - videoswitch
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.3!-r 1!-l ifOperStatus 
  	 } 
 
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 srvocsw 
- 	 service_description 	 Gi1/0/04 - UNUSED
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.4!-r 2!-l ifOperStatus
+ 	 service_description 	 Gi1/0/04 - control/1
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.4!-r " (1|2)$"!-l ifOperStatus
  	 } 
 
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 srvocsw 
- 	 service_description 	 Gi1/0/05 - AP1
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.5!-r 1!-l ifOperStatus 
+ 	 service_description 	 Gi1/0/05 - control/2
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.5!-r " (1|2)$"!-l ifOperStatus 
  	 } 
 
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 srvocsw 
- 	 service_description 	 Gi1/0/06 - UNUSED
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.6!-r 2!-l ifOperStatus 
+ 	 service_description 	 Gi1/0/06 - intercom/1
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.6!-r " (1|2)$"!-l ifOperStatus 
  	 } 
 
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 srvocsw 
- 	 service_description 	 Gi1/0/07 - unused
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.7!-r 2!-l ifOperStatus 
+ 	 service_description 	 Gi1/0/07 - intercom/2
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.7!-r " (1|2)$"!-l ifOperStatus 
  	 } 
 
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 srvocsw 
- 	 service_description 	 Gi1/0/08 - UNUSED
-	 check_command		 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.8!-r 2!-l ifOperStatus
+ 	 service_description 	 Gi1/0/08 - UPLINK
+	 check_command		 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.8!-r 1!-l ifOperStatus
 	 notifications_enabled 0
  	 } 
 
@@ -68,19 +68,19 @@ define service {
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 srvocsw 
  	 service_description 	 Gi1/0/09 - UNUSED
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.9!-r 2!-l ifOperStatus 
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.9!-r 2!-l ifOperStatus 
  	 } 
 
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 srvocsw 
  	 service_description 	 Gi1/0/10 - UNUSED
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10!-r 2!-l ifOperStatus 
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10!-r 2!-l ifOperStatus 
  	 } 
 
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 srvocsw 
  	 service_description 	 Vlan20
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.52802!-r 1!-l ifOperStatus 
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.52802!-r 1!-l ifOperStatus 
 }
diff --git a/monitoring/nagios3/objects/switch/04-core-receptionsw.cfg b/monitoring/nagios3/objects/switch/04-core-receptionsw.cfg
index 21c55c5..781fcb8 100644
--- a/monitoring/nagios3/objects/switch/04-core-receptionsw.cfg
+++ b/monitoring/nagios3/objects/switch/04-core-receptionsw.cfg
@@ -2,7 +2,7 @@ define host {
 	host_name	receptionsw
 	use		generic-host
 	alias		receptionsw
-	address		10.20.0.21
+	address		10.20.0.26
 	hostgroups	core-switches,tplink-switches
 	parents		eric
 }
@@ -10,57 +10,57 @@ define host {
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 receptionsw 
- 	 service_description 	 Gi1/0/01 - coresw
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.1!-r 1!-l ifOperStatus 
+ 	 service_description 	 Gi1/0/01 - off
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.1!-r 2!-l ifOperStatus 
  	 } 
 
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 receptionsw 
- 	 service_description 	 Gi1/0/02 - UNUSED
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.2!-r 2!-l ifOperStatus 
+ 	 service_description 	 Gi1/0/02 - phone
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.2!-r 1!-l ifOperStatus 
  	 } 
 
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 receptionsw 
- 	 service_description 	 Gi1/0/03 - UNUSED
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.3!-r 2!-l ifOperStatus 
+ 	 service_description 	 Gi1/0/03 - PC1
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.3!-r " (1|2)$"!-l ifOperStatus 
  	 } 
 
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 receptionsw 
- 	 service_description 	 Gi1/0/04 - UNUSED
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.4!-r 2!-l ifOperStatus
+ 	 service_description 	 Gi1/0/04 - PC2
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.4!-r " (1|2)$"!-l ifOperStatus
  	 } 
 
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 receptionsw 
- 	 service_description 	 Gi1/0/05 - UNUSED
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.5!-r 2!-l ifOperStatus 
+ 	 service_description 	 Gi1/0/05 - PC3
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.5!-r " (1|2)$"!-l ifOperStatus 
  	 } 
 
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 receptionsw 
  	 service_description 	 Gi1/0/06 - UNUSED
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.6!-r 2!-l ifOperStatus 
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.6!-r 2!-l ifOperStatus 
  	 } 
 
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 receptionsw 
- 	 service_description 	 Gi1/0/07 - wired/laptop
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.7!-r " (1|2)$"!-l ifOperStatus 
+ 	 service_description 	 Gi1/0/07 - UNUSED
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.7!-r 1!-l ifOperStatus 
  	 } 
 
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 receptionsw 
- 	 service_description 	 Gi1/0/08 - wired/PRINTER
-	 check_command		 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.8!-r 1!-l ifOperStatus
+ 	 service_description 	 Gi1/0/08 - UPLINK
+	 check_command		 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.8!-r 1!-l ifOperStatus
 	 notifications_enabled 0
  	 } 
 
@@ -68,19 +68,19 @@ define service {
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 receptionsw 
  	 service_description 	 Gi1/0/09 - UNUSED
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.9!-r 2!-l ifOperStatus 
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.9!-r 2!-l ifOperStatus 
  	 } 
 
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 receptionsw 
  	 service_description 	 Gi1/0/10 - UNUSED
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10!-r 2!-l ifOperStatus 
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10!-r 2!-l ifOperStatus 
  	 } 
 
 define service { 
  	 use 	 	 	 generic-service 
  	 hosts 	 	 	 receptionsw 
  	 service_description 	 Vlan20
- 	 check_command 	 	 check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.52802!-r 1!-l ifOperStatus 
+ 	 check_command 	 	 check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.52802!-r 1!-l ifOperStatus 
 }
diff --git a/monitoring/nagios3/objects/switch/05-core-wssw-1.cfg b/monitoring/nagios3/objects/switch/05-core-wssw-1.cfg
deleted file mode 100644
index 0ee0db3..0000000
--- a/monitoring/nagios3/objects/switch/05-core-wssw-1.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-define host {
-	host_name	wssw1
-	use		generic-host
-	alias		wssw1
-	address		10.20.0.24
-	hostgroups	core-switches,cisco-switches
-	parents		eric
-}
diff --git a/monitoring/nagios3/objects/switch/06-core-wssw-2.cfg b/monitoring/nagios3/objects/switch/06-core-wssw-2.cfg
deleted file mode 100644
index bfcdf38..0000000
--- a/monitoring/nagios3/objects/switch/06-core-wssw-2.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-define host {
-	host_name	wssw2
-	use		generic-host
-	alias		wssw2
-	address		10.20.0.25
-	hostgroups	core-switches,cisco-switches
-	parents		eric
-}
diff --git a/monitoring/nagios3/objects/switch/09-core-nocsw.cfg b/monitoring/nagios3/objects/switch/09-core-nocsw.cfg
index d3aa0b4..1f7671f 100644
--- a/monitoring/nagios3/objects/switch/09-core-nocsw.cfg
+++ b/monitoring/nagios3/objects/switch/09-core-nocsw.cfg
@@ -3,7 +3,7 @@ define host {
 	use		generic-host
 	alias		nocsw
 	address		10.20.0.23
-	hostgroups	core-switches,cisco-switches
+	hostgroups	core-switches,cisco-nocswiches
 	parents		coresw
 }
 
@@ -11,208 +11,208 @@ define service {
          use                     generic-service
          hosts                   nocsw
          service_description     Vlan1
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.1!-r 2!-l ifOperStatus
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.1!-r 2!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
          service_description     Vlan20
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.20!-r " (1|2)$"!-l ifOperStatus
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.20!-r " (1|2)$"!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
-         service_description     Gi0/01 - UNUSED
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10101!-r " (1|2)$"!-l ifOperStatus
+         service_description     Gi0/01 - phone/1
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10101!-r 1!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
-         service_description     Gi0/02 - UNUSED
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10102!-r " (1|2)$"!-l ifOperStatus
+         service_description     Gi0/02 - phone/2
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10102!-r " (1|2)$"!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
-         service_description     Gi0/03 - uplink
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10103!-r " (1|2)$"!-l ifOperStatus
+         service_description     Gi0/03 - ext/1
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10103!-r " (1|2)$"!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
-         service_description     Gi0/04 - uplink
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10104!-r " (1|2)$"!-l ifOperStatus
+         service_description     Gi0/04 - ext/2
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10104!-r " (1|2)$"!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
-         service_description     Gi0/05 - mgmt
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10105!-r " (1|2)$"!-l ifOperStatus
+         service_description     Gi0/05 - mgmt/1
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10105!-r " (1|2)$"!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
-         service_description     Gi0/06 - mgmt
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10106!-r " (1|2)$"!-l ifOperStatus
+         service_description     Gi0/06 - mgmt/2
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10106!-r " (1|2)$"!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
-         service_description     Gi0/07 - mgmt
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10107!-r " (1|2)$"!-l ifOperStatus
+         service_description     Gi0/07 - wired/1
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10107!-r " (1|2)$"!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
-         service_description     Gi0/08 - mgmt
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10108!-r " (1|2)$"!-l ifOperStatus
+         service_description     Gi0/08 - wired/2
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10108!-r " (1|2)$"!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
-         service_description     Gi0/09 - wired
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10109!-r " (1|2)$"!-l ifOperStatus
+         service_description     Gi0/09 - wireless/1
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10109!-r " (1|2)$"!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
-         service_description     Gi0/10 - wired
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10110!-r " (1|2)$"!-l ifOperStatus
+         service_description     Gi0/10 - wireless/2
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10110!-r " (1|2)$"!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
-         service_description     Gi0/11 - wired
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10111!-r " (1|2)$"!-l ifOperStatus
+         service_description     Gi0/11 - video/1
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10111!-r " (1|2)$"!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
-         service_description     Gi0/12 - wired
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10112!-r " (1|2)$"!-l ifOperStatus
+         service_description     Gi0/12 - video/2
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10112!-r " (1|2)$"!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
-         service_description     Gi0/13 - wireless
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10113!-r " (1|2)$"!-l ifOperStatus
+         service_description     Gi0/13 - video/3
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10113!-r " (1|2)$"!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
-         service_description     Gi0/14 - wireless
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10114!-r " (1|2)$"!-l ifOperStatus
+         service_description     Gi0/14 - video/4
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10114!-r " (1|2)$"!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
-         service_description     Gi0/15 - wireless
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10115!-r " (1|2)$"!-l ifOperStatus
+         service_description     Gi0/15 - overflow/1
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10115!-r " (1|2)$"!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
-         service_description     Gi0/16 - wireless
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10116!-r " (1|2)$"!-l ifOperStatus
+         service_description     Gi0/16 - overflow/2
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10116!-r " (1|2)$"!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
-         service_description     Gi0/17 - video
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10117!-r " (1|2)$"!-l ifOperStatus
+         service_description     Gi0/17 - SPARE/RECONFIG
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10117!-r " (1|2)$"!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
-         service_description     Gi0/18 - video
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10118!-r " (1|2)$"!-l ifOperStatus
+         service_description     Gi0/18 - SPARE/RECONFIG
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10118!-r " (1|2)$"!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
-         service_description     Gi0/19 - video
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10119!-r " (1|2)$"!-l ifOperStatus
+         service_description     Gi0/19 - SPARE/RECONFIG
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10119!-r " (1|2)$"!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
-         service_description     Gi0/20 - video
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10120!-r " (1|2)$"!-l ifOperStatus
+         service_description     Gi0/20 - SPARE/RECONFIG
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10120!-r " (1|2)$"!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
-         service_description     Gi0/21 - overflow
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10121!-r " (1|2)$"!-l ifOperStatus
+         service_description     Gi0/21 - SPARE/RECONFIG
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10121!-r " (1|2)$"!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
-         service_description     Gi0/22 - overflow
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10122!-r " (1|2)$"!-l ifOperStatus
+         service_description     Gi0/22 - SPARE/RECONFIG
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10122!-r " (1|2)$"!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
-         service_description     Gi0/23
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10123!-r 1!-l ifOperStatus
+         service_description     Gi0/23 - UPLINK/spare
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10123!-r " (1|2)$"!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
-         service_description     Gi0/24
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10124!-r " (1|2)$"!-l ifOperStatus
+         service_description     Gi0/24 - UPLINK
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10124!-r " (1|2)"!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
          service_description     Gi0/25
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10125!-r 2!-l ifOperStatus
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10125!-r 2!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
          service_description     Gi0/26
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10126!-r 2!-l ifOperStatus
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10126!-r 2!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
          service_description     Gi0/27
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10127!-r 2!-l ifOperStatus
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10127!-r 2!-l ifOperStatus
 }
 
 define service {
          use                     generic-service
          hosts                   nocsw
          service_description     Gi0/28
-         check_command           check_snmp_cisco!.1.3.6.1.2.1.2.2.1.8.10128!-r 2!-l ifOperStatus
+         check_command           check_snmp_cisco_new!.1.3.6.1.2.1.2.2.1.8.10128!-r 2!-l ifOperStatus
 }
diff --git a/monitoring/nagios3/objects/video/control-laptops/01-main-room.cfg b/monitoring/nagios3/objects/video/control-laptops/01-main-room.cfg
index 0a45065..a79562a 100644
--- a/monitoring/nagios3/objects/video/control-laptops/01-main-room.cfg
+++ b/monitoring/nagios3/objects/video/control-laptops/01-main-room.cfg
@@ -7,11 +7,13 @@ define host {
 	parents		mrvocsw
 }
 
-define host {
-	host_name	control-m-2
-	use		videoteam-host
-	alias		control-m-2
-	address		10.23.0.32
-	hostgroups	video-equipment,control-group
-	parents		mrvocsw
-}
+# Disabled by Stefan Lekov
+# 10.23.0.32 is the control laptop in small room
+#define host {
+#	host_name	control-m-2
+#	use		videoteam-host
+#	alias		control-m-2
+#	address		10.23.0.32
+#	hostgroups	video-equipment,control-group
+#	parents		mrvocsw
+#}
diff --git a/monitoring/nagios3/objects/video/control-laptops/02-second-room.cfg b/monitoring/nagios3/objects/video/control-laptops/02-second-room.cfg
index dddb22b..f83afb0 100644
--- a/monitoring/nagios3/objects/video/control-laptops/02-second-room.cfg
+++ b/monitoring/nagios3/objects/video/control-laptops/02-second-room.cfg
@@ -2,16 +2,17 @@ define host {
 	host_name	control-s-1
 	use		videoteam-host
 	alias		control-s-1
-	address		10.23.0.41
+	address		10.23.0.32
 	hostgroups	video-equipment,control-group
 	parents		srvocsw
 }
 
-define host {
-	host_name	control-s-2
-	use		videoteam-host
-	alias		control-s-2
-	address		10.23.0.42
-	hostgroups	video-equipment,control-group
-	parents		srvocsw
-}
+# Disabled by Stefan Lekov
+#define host {
+#	host_name	control-s-2
+#	use		videoteam-host
+#	alias		control-s-2
+#	address		10.23.0.42
+#	hostgroups	video-equipment,control-group
+#	parents		srvocsw
+#}
diff --git a/monitoring/nagios3/objects/video/intercom/01-intercom-main-room.cfg b/monitoring/nagios3/objects/video/intercom/01-intercom-main-room.cfg
deleted file mode 100644
index ae44099..0000000
--- a/monitoring/nagios3/objects/video/intercom/01-intercom-main-room.cfg
+++ /dev/null
@@ -1,26 +0,0 @@
-define host {
-	host_name	icom-m-1
-	use		generic-host
-	alias		icom-m-1
-	address		10.23.0.35
-	hostgroups	intercom-group,ssh-servers
-	parents		mrvocsw
-}
-
-define host {
-	host_name	icom-m-2
-	use		generic-host
-	alias		icom-m-2
-	address		10.23.0.36
-	hostgroups	intercom-group,ssh-servers
-	parents		mrvocsw
-}
-
-define host {
-	host_name	icom-m-3
-	use		generic-host
-	alias		icom-m-3
-	address		10.23.0.37
-	hostgroups	intercom-group,ssh-servers
-	parents		mrvocsw
-}
diff --git a/monitoring/nagios3/objects/video/intercom/02-intercom-second-room.cfg b/monitoring/nagios3/objects/video/intercom/02-intercom-second-room.cfg
deleted file mode 100644
index 3167657..0000000
--- a/monitoring/nagios3/objects/video/intercom/02-intercom-second-room.cfg
+++ /dev/null
@@ -1,26 +0,0 @@
-define host {
-	host_name	icom-s-1
-	use		generic-host
-	alias		icom-s-1
-	address		10.23.0.45
-	hostgroups	intercom-group,ssh-servers
-	parents		srvocsw
-}
-
-define host {
-	host_name	icom-s-2
-	use		generic-host
-	alias		icom-s-2
-	address		10.23.0.46
-	hostgroups	intercom-group,ssh-servers
-	parents		srvocsw
-}
-
-define host {
-	host_name	icom-s-3
-	use		generic-host
-	alias		icom-s-3
-	address		10.23.0.47
-	hostgroups	intercom-group,ssh-servers
-	parents		srvocsw
-}
diff --git a/monitoring/nagios3/objects/video/video-mixers/01-main-room.cfg b/monitoring/nagios3/objects/video/video-mixers/01-main-room.cfg
index 8923c2c..63a2ae0 100644
--- a/monitoring/nagios3/objects/video/video-mixers/01-main-room.cfg
+++ b/monitoring/nagios3/objects/video/video-mixers/01-main-room.cfg
@@ -2,7 +2,7 @@ define host {
 	host_name	atem-mr
 	use		videoteam-host
 	alias		atem-mr
-	address		10.23.0.11
+	address		10.23.0.5
 	hostgroups	video-equipment,atem-group
 	parents		mrvocsw
 }
diff --git a/monitoring/nagios3/objects/video/video-mixers/02-second-room.cfg b/monitoring/nagios3/objects/video/video-mixers/02-second-room.cfg
index 562cec7..bb20e9b 100644
--- a/monitoring/nagios3/objects/video/video-mixers/02-second-room.cfg
+++ b/monitoring/nagios3/objects/video/video-mixers/02-second-room.cfg
@@ -2,7 +2,7 @@ define host {
 	host_name	atem-sr
 	use		videoteam-host
 	alias		atem-sr
-	address		10.23.0.12
+	address		10.23.0.6
 	hostgroups	video-equipment,atem-group
 	parents		srvocsw
 }
diff --git a/monitoring/nagios3/objects/wifi/ap-cf-sr-1.cgf b/monitoring/nagios3/objects/wifi/ap-cf-sr-1.cfg.disabled
similarity index 100%
rename from monitoring/nagios3/objects/wifi/ap-cf-sr-1.cgf
rename to monitoring/nagios3/objects/wifi/ap-cf-sr-1.cfg.disabled
diff --git a/monitoring/nagios3/objects/wifi/ap-cf-sr-2.cgf b/monitoring/nagios3/objects/wifi/ap-cf-sr-2.cfg
similarity index 100%
rename from monitoring/nagios3/objects/wifi/ap-cf-sr-2.cgf
rename to monitoring/nagios3/objects/wifi/ap-cf-sr-2.cfg
diff --git a/monitoring/nagios3/resource.cfg b/monitoring/nagios3/resource.cfg
index 1f045a1..b79b317 100644
--- a/monitoring/nagios3/resource.cfg
+++ b/monitoring/nagios3/resource.cfg
@@ -29,5 +29,8 @@ $USER1$=/usr/lib/nagios/plugins
 # Store some usernames and passwords (hidden from the CGIs)
 #$USER3$=someuser
 #$USER4$=somepassword
-$USER3$=changeme
-$USER4$=changeme
+$USER3$=password
+$USER4$=public
+
+$USER5$=password
+