close to done, just to add some diagnostics tools on top