Better monitoring (14/38)

Better monitoring