Better monitoring (28/38)

Better monitoring