improuvements for monitoring