concatenated version
updated documentation
concatenated version with documentation updates