Better monitoring (24/38)

Better monitoring