preparing to document
merged and documented