Better monitoring (21/38)

Better monitoring