Better monitoring (30/38)

Better monitoring