Merged docs from paul