Better monitoring (32/38)

Better monitoring