more work around durabilit and documentation