Better monitoring (27/38)

Better monitoring