Better monitoring (9/38)

Better monitoring