Better monitoring (20/38)

Better monitoring