Edited docs from Andrey's branch