Better monitoring (13/38)

Better monitoring