Better monitoring (19/38)

Better monitoring