Better monitoring (12/38)

Better monitoring