Better monitoring (7/38)

Better monitoring