Better monitoring (5/38)

Better monitoring