Better monitoring (8/38)

Better monitoring