Better monitoring (10/38)

Better monitoring