Additional work on nagios