further work on documentation-driven approach