Better monitoring (25/38)

Better monitoring