Monitoring logic updated