Better monitoring (2/38)

Better monitoring