Better monitoring (36/38)

Better monitoring