Better monitoring (23/38)

Better monitoring