Better monitoring (26/38)

Better monitoring