update to latest version, REWORK DOCS. UNTESTED