Better monitoring (16/38)

Better monitoring