New version with docs