Better monitoring (11/38)

Better monitoring