Better monitoring (37/38)

Better monitoring