Better monitoring (6/38)

Better monitoring