Merge pull request #1232 from oceanprotocol/issue1221-restructure-order

Issue1221 restructure order

.gitbook.yaml

@@ -54,12 +54,19 @@ redirects:
     building-with-ocean/contributing/legal-reqs: contribute/legal-reqs.md
     building-with-ocean/projects-using-ocean: contribute/projects-using-ocean.md
     veocean-data-farming: rewards/README.md
-    veocean-data-farming/veocean: rewards/veocean.md
+    veocean-data-farming/veocean: rewards/df-veocean.md
     veocean-data-farming/df-intro: rewards/df-intro.md
-    veocean-data-farming/df-background: rewards/df-max-out-yield.md
+    veocean-data-farming/df-background: rewards/df-volumedf.md.md
     veocean-data-farming/emissions-apys: rewards/df-emissions-apys.md
     veocean-data-farming/delegation: rewards/README.md
-    rewards/veOcean-Data-Farming-Tutorial: user-guides/get-started-df.md
+    rewards/veOcean-Data-Farming-Tutorial: user-guides/data-farming/how-to-veocean.md
     api-references: developers/README.md
     api-references/aquarius-rest-api: developers/aquarius/asset-requests.md
     api-references/provider-rest-api: developers/provider/general-endpoints.md
+    user-guides/claim-ocean-rewards: user-guides/data-farming/how-to-claim-ocean-rewards.md
+    user-guides/get-started-df: user-guides/data-farming/how-to-veocean.md
+    user-guides/how-to-data-farm: user-guides/data-farming/how-to-volume-df.md
+    user-guides/how-to-df-estimate-apy: user-guides/data-farming/how-to-estimate-apy.md
+    rewards/df-basic: rewards/df-guides.md
+    rewards/veocean: rewards/df-veocean.md
+    rewards/df-max-out-yield: rewards/df-volumedf.md

SUMMARY.md

@@ -28,13 +28,13 @@
     * [Github](user-guides/asset-hosting/github.md)
   * [Join a Data Challenge](user-guides/join-a-data-challenge.md)
   * [Sponsor a Data Challenge](user-guides/sponsor-a-data-challenge.md)
-  * [Data Farming](user-guides/data-farming/data-farming-101.md)
+  * [Data Farming](user-guides/data-farming/README.md)
-    * [Get Started with Passive Rewards](user-guides/data-farming/how-to-farm-veOCEAN.md)
+    * [Earn Passive Rewards](user-guides/data-farming/how-to-veocean.md)
-    * [Estimate your APYs](user-guides/how-to-df-estimate-apy.md)
+    * [Estimate APYs](user-guides/data-farming/how-to-estimate-apy.md)
-    * [Claim Rewards](user-guides/data-farming/how-to-farm-claim-rewards.md)
+    * [Claim Rewards](user-guides/data-farming/how-to-claim-rewards.md)
-    * [Curate with Volume DF](user-guides/data-farming/how-to-farm-volumedf.md)
+    * [Curate Data](user-guides/data-farming/how-to-volumedf.md)
-    * [Delegate](user-guides/data-farming/how-to-farm-delegate.md)
+    * [Delegate Curation](user-guides/data-farming/how-to-delegate.md)    
-    * [Predict with Challenge DF](user-guides/data-farming/how-to-farm-challengedf.md)
+    * [Predict ETH](user-guides/data-farming/how-to-challengedf.md)
   * [Liquidity Pools \[deprecated\]](user-guides/remove-liquidity-pools.md)
 * [💻 Developers](developers/README.md)
   * [Architecture Overview](developers/architecture.md)
@@ -117,12 +117,12 @@
   * [C2D - Private Docker Registry](infrastructure/compute-to-data-docker-registry.md)
 * [🤑 DeFi](defi/README.md)
 * [💰 Data Farming Rewards](rewards/README.md)
-  * [Data Farming 101 (White Belt)](rewards/df-intro.md)
+  * [Farming 101](rewards/df-intro.md)
-  * [DF "ve" in veOCEAN (Blue Belt)](rewards/veocean.md)
+  * [veOCEAN](rewards/df-veocean.md)
-  * [DF Max Out Yield (Purple Belt)](rewards/df-max-out-yield.md)
+  * [Curate with Volume DF](rewards/df-volumedf.md.md)
-  * [DF Challenge (Red Belt)](rewards/df-challenges.md)
+  * [Predict with Challenge DF](rewards/df-challengedf.md)
-  * [DF Deep Dives (Brown Belt)](rewards/df-basic.md)
+  * [Complete User Guides](rewards/df-guides.md)
-  * [DF Emissions & APYs (Black Belt)](rewards/df-emissions-apys.md)
+  * [Emissions & APYs](rewards/df-emissions-apys.md)
 * [🤝 Contribute](contribute/README.md)
   * [Partners & Collaborators](contribute/projects-using-ocean.md)
   * [Contributor Code of Conduct](contribute/code-of-conduct.md)

defi/README.md

@@ -10,16 +10,11 @@ coverY: 0
 
 Ocean Protocol's open-source tools are useful in a variety of DeFi applications. Here we show you how to capitalize with Ocean Protocol tech in several ways using crypto trading!
 
-## Data Farming - Challenge DF (Predict-ETH) 📈
+## Data Farming - Challenge DF 📈
 
-Data Farming offers a weekly rewards via Challenge DF, a challenge where users predict the price of Ethereum and win prizes 💰 based on accuracy.
+Data Farming offers a weekly rewards via [Challenge DF](../../rewards/df-challengedf.md), a challenge where users predict the price of Ethereum and win prizes 💰 based on accuracy.
 
-Weekly prizes total 5000 $OCEAN
+In this competition, participants use machine learning to submit future ETH prices for the next 12 hours as accurately as possible. They upload these predictions to Ocean Market as data NFTs.
-1st Place - 2500
-2nd Place - 1500
-3rd Place - 1000
-
-In this competition, participants use machine learning to submit future ETH prices for the next 12 hours as accurately as possible. They upload these predictions to Ocean Market as data NFTs. This challenge promotes more valuable data feeds on the Ocean Market while participants earn cash. It's a win-win for both Ocean Protocol and challenge participants!
 
 Check our [Challenge DF page](https://df.oceandao.org/challenges) and join the active Predict ETH challenge!
 

developers/subgraph/get-veocean-stats.md

@@ -4,7 +4,7 @@ description: 'Discover the World of veOCEAN: Retrieving a Stats'
 
 # Get veOCEAN stats
 
-If you are already familiarized with veOCEAN, you're off to a great start. However, if you need a refresher, we recommend visiting the [veOCEAN](../../rewards/veocean.md) page for a quick overview :mag:
+If you are already familiarized with veOCEAN, you're off to a great start. However, if you need a refresher, we recommend visiting the [veOCEAN](../../rewards/df-veocean.md) page for a quick overview :mag:
 
 On this page, you'll find a few examples to fetch the stats of veOCEANS from the Ocean Subgraph. These examples serve as a valuable starting point to help you retrieve essential information about veOCEAN. However, if you're eager to delve deeper into the topic, we invite you to visit our [GitHub](https://github.com/oceanprotocol/ocean-subgraph/blob/main/test/integration/VeOcean.test.ts) repository. There, you'll discover a wealth of additional examples, which provide comprehensive insights. Feel free to explore and expand your knowledge! :books:
 

discover/basic-concepts.md

@@ -30,4 +30,4 @@ Ocean tokens (**OCEAN**) are the native cryptocurrency of the Ocean Protocol eco
 
 1. **Data Ownership**: Ocean tokens empower data owners by providing them with control over their data assets. Through the use of smart contracts, data owners can define access permissions, usage rights, and pricing terms for their data. By holding and staking Ocean tokens, data owners can exercise even greater control over their data assets.
 2. **Data Monetization and Consumption**: Ocean tokens facilitate seamless and secure transactions between data providers and consumers, fostering a thriving new data economy. Data owners can set a price in Ocean tokens for consumers to access and utilize their data. This creates opportunities for unlocking value from siloed or otherwise unused data.
-3. **Stake for veOcean and Curate Datasets**: Through the Data Farming initiative, you are incentivized to lock Ocean tokens for [veOCEAN](../rewards/veocean.md). By staking your OCEAN, you not only support the growth and sustainability of the ecosystem but also earn a share of data asset sales 💰. The Data Farming initiative offers participants a unique opportunity to earn [rewards](../rewards/README.md) while making a meaningful impact in the data marketplace.
+3. **Stake for veOcean and Curate Datasets**: Through the Data Farming initiative, you are incentivized to lock Ocean tokens for [veOCEAN](../rewards/df-veocean.md). By staking your OCEAN, you not only support the growth and sustainability of the ecosystem but also earn a share of data asset sales 💰. The Data Farming initiative offers participants a unique opportunity to earn [rewards](../rewards/README.md) while making a meaningful impact in the data marketplace.

discover/explore.md

@@ -114,9 +114,9 @@ Furthermore, provider fees are not restricted to data consumption; they can also
 
 <details>
 
-<summary><mark style="color:purple;">Earn Rewards</mark><br><br>The <a href="../rewards/df-max-out-yield.md">Data Farming</a> initiative is a key feature of Ocean Protocol that empowers participants to earn <a href="../rewards/">rewards</a> while contributing to a decentralized data economy. By staking Ocean tokens and actively participating in data markets, users play a vital role in enhancing the availability and accessibility of valuable data assets</summary>
+<summary><mark style="color:purple;">Earn Rewards</mark><br><br>The <a href="../rewards/df-volumedf.md.md">Data Farming</a> initiative is a key feature of Ocean Protocol that empowers participants to earn <a href="../rewards/">rewards</a> while contributing to a decentralized data economy. By staking Ocean tokens and actively participating in data markets, users play a vital role in enhancing the availability and accessibility of valuable data assets</summary>
 
-Through the Data Farming initiative, you are incentivized to lock Ocean tokens for [veOcean](../rewards/veocean.md). By staking your tokens, you not only support the growth and sustainability of the ecosystem but also earn a share of the generated incentives💰. The Data Farming initiative offers participants a unique opportunity to earn [rewards](../rewards/README.md) while making a meaningful impact in the data marketplace.
+Through the Data Farming initiative, you are incentivized to lock Ocean tokens for [veOcean](../rewards/df-veocean.md). By staking your tokens, you not only support the growth and sustainability of the ecosystem but also earn a share of the generated incentives💰. The Data Farming initiative offers participants a unique opportunity to earn [rewards](../rewards/README.md) while making a meaningful impact in the data marketplace.
 
 Participating in the Data Farming initiative demonstrates a commitment to the principles of **fairness**, **transparency**, and **collaboration** that underpin Ocean Protocol. It allows you to actively engage with the ecosystem, promoting innovation, and driving the evolution of the decentralized data economy.
 

discover/faq.md

@@ -206,7 +206,7 @@ Checkout our [roadmap](https://oceanprotocol.com/technology/roadmap) to see what
 
 <summary>What assets are eligible for Data Farming?</summary>
 
-The data asset may be of any type — dataset (for static URIs), algorithm for Compute-to-Data, or any other Datatoken token-gated system. The data asset may be fixed price or free price. You can find more details in the [DF Background page](../rewards/df-max-out-yield.md#assets-that-qualify-for-data-farming)
+The data asset may be of any type — dataset (for static URIs), algorithm for Compute-to-Data, or any other Datatoken token-gated system. The data asset may be fixed price or free price. You can find more details in the [DF Background page](../rewards/df-volumedf.md.md#assets-that-qualify-for-data-farming)
 
 </details>
 
@@ -214,7 +214,7 @@ The data asset may be of any type — dataset (for static URIs), algorithm for C
 
 <summary>When exactly does counting start and finish, for a given week?</summary>
 
-The counting starts at 12.01am on Thursday, and ends at 11.59pm on the following Wednesday.
+The counting starts at 00:00am on Thursday UTC, and ends at 11.59pm UTC on the following Wednesday.
 
 </details>
 

discover/glossary.md

@@ -18,7 +18,7 @@ Ocean Protocol is a decentralized data exchange protocol that enables individual
 
 <details>
 
-<summary>$OCEAN</summary>
+<summary>OCEAN</summary>
 
 The Ocean Protocol token (OCEAN) is a utility token used in the Ocean Protocol ecosystem. It serves as a medium of exchange and a unit of value for data services in the network. Participants in the Ocean ecosystem can use OCEAN tokens to buy and sell data, stake on data assets, and participate in the governance of the protocol.
 
@@ -137,17 +137,25 @@ In exchange for locking tokens, users can earn rewards. The amount of reward dep
 
 <details>
 
-<summary>DF Passive Rewards</summary>
+<summary>Passive Rewards</summary>
 
-When a user locks their OCEAN tokens for a finite period of time, they get veOCEAN tokens in return. Based on the quantity of veOCEAN, the user accumulates weekly OCEAN [rewards](../rewards/df-intro.md#what-are-active-rewards). Because rewards are generated without human intervention, these are called "passive" OCEAN rewards. OCEAN rewards are claimable every Thursday on the [Rewards page](https://df.oceandao.org/rewards).
+When a user locks their OCEAN tokens for a finite period of time, they get veOCEAN tokens in return. Based on the quantity of veOCEAN, the user accumulates weekly OCEAN rewards. Because rewards are generated without human intervention, these are called [Passive Rewards](../rewards/df-intro.md#what-are-passive-rewards). OCEAN Data Farming Passive Rewards are claimable every Thursday on the [Rewards page](https://df.oceandao.org/rewards).
 
 </details>
 
 <details>
 
-<summary>DF Active Rewards</summary>
+<summary>Volume DF</summary>
 
-When a user allocates veOCEAN tokens to Ocean Market projects, then weekly OCEAN rewards are given to a user based on the sales of those projects. Since these rewards depend on human intervention to decide the allocations, they are categorized as "active" [rewards](../rewards/df-intro.md#what-are-passive-rewards) instead of passive rewards. OCEAN rewards are claimable every Thursday on the [Rewards page](https://df.oceandao.org/rewards).
+When a user allocates veOCEAN tokens to Ocean Market projects, then weekly OCEAN rewards are given to a user based on the sales of those projects. Since these rewards depend on human intervention to decide the allocations, these are categorized as [Volume DF](../rewards/df-intro.md#what-is-volume-df) rewards. OCEAN Data Farming Volume DF rewards are claimable every Thursday on the [Rewards page](https://df.oceandao.org/rewards).
+
+</details>
+
+<details>
+
+<summary>Challenge DF</summary>
+
+When a user submits prediction algorithms to the [Challenge DF program](https://df.oceandao.org/challenges) that accurately estimate the price of Ethereum, then OCEAN rewards are airdropped to that user if win one of the top 3 prizes. Since these rewards depend on human intervention to compete in this challenge, these are categorized as [Challenge DF](../rewards/df-intro.md#what-is-challenge-df) rewards. OCEAN Data Farming Challenge DF rewards are claimable every Thursday on the [Rewards page](https://df.oceandao.org/rewards).
 
 </details>
 

rewards/README.md

@@ -4,36 +4,71 @@ cover: ../.gitbook/assets/cover/rewards_banner.png
 coverY: 0
 ---
 
-# Data Farming Rewards 💰
+## What is Data Farming?
 
-### Why did we create the Data Farming dApp?
+Data Farming is Ocean Protocol's core incentive program that rewards participants to onboard the protocol and create value by using tools that help grow it further.
 
-The purpose of Ocean Protocol's Data Farming dApp reward system is to incentivize the growth, curation, and publishing of high-quality data NFTs in the Ocean Ecosystem.  
+Data Farming participants earn OCEAN rewards across 2 main streams **Passive Rewards** and **Active Rewards**. Participants are able to **receive rewards passively, actively, or both** by engaging in a variety of activities.
 
-Data Farming participants earn OCEAN rewards for these activities.
+Passive Rewards provides a way for all contributors to participate.
-Data Farming rewards are structured in 2 main streams **Passive Rewards** and **Active Rewards**. At a minimum, Data Farmers earn "passive rewards" for locking their OCEAN tokens to get veOCEAN tokens in return. Then, Data Farmers can maximize their yield by earning "active rewards". Active Rewards stream it's broken down into multiple substreams, to offer you a variaty of ways to contribute to Ocean Protocol values and increase your Data Farming rewards: Volume DF, Challenge DF.
+
+Active Rewards focuses on incentivizing the curation and publishing of high-quality data assets and DataNFTs within the Ocean Ecosystem. 
+
+We have used battle-tested contracts that safeguard billions (veCRV). With this model there is no liquidity risk. You can’t lose your OCEAN through Impermanent-Loss (IL). It is merely locked.
+
+## Introduction
+
+[Farming 101](df-intro.md) introduces Data Farming, the various reward systems, how they work, and how to access them. By the end of the document, you should feel more familiar with Data Farming concepts and having a better idea of what subject you might want to learn about next.
 
 ## veOCEAN
 
-Learning about [veOCEAN](veocean.md) will help you answer the question "What is the purpose of holding veOCEAN?" & give insights on how veOCEAN (vote-escrowed OCEAN) works. It will teach you everything you need to know about why it exists and how it works.
+Learning about [veOCEAN](df-veocean.md) will help you answer the question "What is the purpose of veOCEAN?" and give insights on how veOCEAN (vote-escrowed OCEAN) is used inside of Ocean Protocol to help advance the protocol.
 
-You will learn that by just holding veOCEAN passively, you are able to rewards.
+It may help for you to review the user guide on [how to estimate APY](../user-guides/data-farming/how-to-estimate-apy.md) to get a better idea for how long you'll want to lock your funds.  
 
-veOCEAN is a fork of veCRV. This enables participants to become a governance delegate, and eligible to receive rewards and engage with different protocol mechanisms.
+### Passive Rewards
 
-## Data Farming
+Passive Rewards is the first reward stream within Data Farming.
 
-![DF Rewards Page](../.gitbook/assets/rewards/df_rewards_page.png)
+At a minimum, Data Farmers earn [Passive Rewards](df-intro.md#what-are-passive-rewards) for locking their OCEAN.  
 
-[Data Farming 101](df-intro.md) introduces the different reward systems, how they work, and how to access them. By the end of the page, you should be more familiar with how Data Farming works and able to take next steps to curate assets.
+It is by-design, without the need for anyone to put in any significant effort. You simply need to lock your tokens for a period of time.
 
-[Data Farming Background](df-max-out-yield.md) will provide you with more intuitions about Data Farming, briefly explain the Reward Function, and how the program evolved over time.
+Passive Rewards offers a defined amount of rewards for each round that is divided amongst veOCEAN holders based on how much they hold.
 
-## Delegation
+Once your tokens are locked up, you can then learn [how to claim rewards](../user-guides/data-farming/how-to-claim-rewards.md).
 
-[Delegation](..user-guides/data-farming/how-to-farm-delegate.md) will teach you how to share your veOCEAN allocation power to other users that can help manage Volume DF substream for you.
+### Active Rewards
 
-Once delegated, rewards will be sent to the wallet address you delegated to. The delegation receiver is in charge of managing your Allocation Power and cut from the rewards.
+Active Rewards is the second reward streamm within Data Farming.
+
+For participants that are more engaged and want to increase their yield, the [Active Rewards](df-intro.md#what-are-active-rewards) stream is broken down into multiple substreams. This offers contributors a variety of ways to help Ocean Protocol grow and increase your Data Farming rewards:
+1. Volume DF
+1. Challenge DF
+
+#### Curate Data with Volume DF
+
+If you have locked your OCEAN tokens in exchange for veOCEAN, this is the ideal opportunity for you to utilize those veOCEAN tokens to earn higher yield.
+
+You can learn about [the design of Volume DF](df-volumedf.md) to learn about it's substreams. Here, curators earn rewards for curating datasets that are driving sales and helping Ocean Protocol achieve traction.
+
+Once you're familiar with the concepts there, you can then read the following user guide on [how to participate in Volume DF](../user-guides/data-farming/how-to-volumedf.md).
+
+## Delegate Curation
+
+The [Delegation](df-volumedf.md#delegating-voting-power) docs will teach you about the concepts of delegating your veOCEAN allocation power to another wallet that will manage Volume DF for you.
+
+You can then use the [how to delegate](../user-guides/data-farming/how-to-delegate.md) user guide to follow the steps needed to successfully delegate.
+
+Please note, once delegated, rewards will be sent to the wallet address you delegated to. The delegation receiver is in charge of managing your Allocation Power and cut from the rewards. 
+
+#### Predict with Challenge DF
+
+In this substream, Data Scientists can win competitions by participating in [Challenge DF](df-challengedf.md). You will obtain overview of what it is, how it works, the rules, and other details.
+
+Challenge DF requires participants to submit algorithms that predict the price of ETH correctly in order to win rewards.
+
+The user guide on [how to Challenge DF](../user-guides/data-farming/how-to-challengedf.md) will take you step-by-step through the process of submitting your algorithm into the competition.
 
 ## Further Reading
 
@@ -41,6 +76,8 @@ Finally, if you want to continue expanding your knowledge on OCEAN token emissio
 
 [Emissions & APYs](df-emissions-apys.md) will provide you will information about how OCEAN will be released over time through the Data Farming program and provide you with APY studies.
 
+[Data Farming Background](df-emissions-apys.md#a-brief-history-of-data-farming) will provide you with a lot more information about Data Farming, how the program evolved, and explain detailed mechanisms of the program such as the Reward Function.
+
 Our [FAQ](../discover/faq.md) answers many different questions about staking, chains, deployments, and other details that may be valuable to you.
 
 ## Reference

rewards/df-basic.md

@@ -1,39 +0,0 @@
----
-description: Show you can complete all User-Guides as the last steps to master Data Farming!
----
-
-# Complete User Guides
-
-<figure><img src="../.gitbook/assets/gif/neo-kinda-martial-arts.gif" alt=""><figcaption><p>Like Neo, you have great potential.</p></figcaption></figure>
-
-### Get Started
-
-Our [User Guides](../user-guides/README.md) get you started on Data Farming quickly so you can complete all operations. Follow these guides to get a complete handle on all Data Farming activities.
-
-{% content-ref url="../user-guides/data-farming/README.md" %}
-[README.md](../user-guides/data-farming/README.md)
-{% endcontent-ref %}
-
-{% content-ref url="../user-guides/data-farming/how-to-farm-veOCEAN.md" %}
-[how-to-farm-veOCEAN.md](../user-guides/data-farming/how-to-farm-veOCEAN.md)
-{% endcontent-ref %}
-
-{% content-ref url="..user-guides/data-farming/how-to-farm-claim-rewards.md" %}
-[how-to-farm-claim-rewards.md](..user-guides/data-farming/how-to-farm-claim-rewards.md)
-{% endcontent-ref %}
-
-{% content-ref url="..user-guides/data-farming/how-to-farm-challengedf.md" %}
-[how-to-farm-challengedf.md](..user-guides/data-farming/how-to-farm-challengedf.md)
-{% endcontent-ref %}
-
-{% content-ref url="..user-guides/data-farming/how-to-farm-volumedf.md" %}
-[how-to-farm-volumedf.md](..user-guides/data-farming/how-to-farm-volumedf.md)
-{% endcontent-ref %}
-
-{% content-ref url="..user-guides/data-farming/how-to-farm-delegate.md" %}
-[how-to-farm-delegate.md](..user-guides/data-farming/how-to-farm-delegate.md)
-{% endcontent-ref %}
-
-### Not much of a reader? Watch and learn, friend
-
-{% embed url="https://youtu.be/zAQlPHkK3og" %}

rewards/df-challengedf.md

@@ -0,0 +1,47 @@
+---
+description: >-
+  Weekly prediction challenges for data scientists to compete, launch algorithms, and start earning. 🏆
+---
+
+# Win Competitions in Challenge DF
+
+<figure><img src="../.gitbook/assets/rewards/gif/eat-data.gif" alt=""><figcaption><p>Let's consume some data.</p></figcaption></figure>
+
+## Publish prediction models and earn rewards
+
+If you're eager to consume data and create valuable assets for publishing but unsure of where to begin, fear not! We've got you covered.
+
+Data Farming offers rewards to data scientists who participate in weekly challenges. We provide the rules and rewards, allowing you to focus on delivering high-quality results.  
+
+**Prizes:**
+1st Place - 2500 OCEAN
+2nd Place - 1500 OCEAN
+3rd Place - 1000 OCEAN
+_Total - 5000 OCEAN_
+
+### What are the base rules?
+
+- A fresh challenge begins and concludes every week.
+- At the beginning of each week, a predetermined amount of OCEAN tokens is allocated as rewards.
+- The rewards are divided into specific amounts for the top three positions.
+- The individuals who submit the top three entries will receive rewards, and their names will be showcased within the Data Farming dapp.
+
+### What do I gain from this?
+
+- Earn OCEAN rewards, [claimable inside our app](https://df.oceandao.org/rewards)
+- Gain in-depth knowledge of the Ocean Protocol stack.
+- Increase your visibility by achieving a place on the podium.
+- Create valuable assets that can be monetized on the Ocean Marketplace.
+- Enhance your skills and engage in friendly competition with other participants.
+
+### Where to start?
+
+Head over to the [Challenges Page](https://df.oceandao.org/challenges) to learn more about Challenge DF, how to submit, and to see historical results.
+
+If you're looking for a step-by-step guide on everything from understanding what a challenge entails to claiming your well-deserved rewards, be sure to check out [how to farm Challenge DF rewards](../user-guides/data-farming/how-to-challengedf.md). It will provide you with all the necessary information you need to make the most out of the challenges.
+
+For a direct link to the Challenge DF README, [click here](https://github.com/oceanprotocol/predict-eth/blob/main/challenges/challenge-df.md).
+
+### Good lock and happy coding!
+
+<figure><img src="../.gitbook/assets/rewards/gif/winner.gif" alt=""><figcaption></figcaption></figure>

rewards/df-challenges.md

@@ -1,40 +0,0 @@
----
-description: >-
-  If you are a data scientist or simply enthusiastic about extracting value from datasets 📊, we have an exciting opportunity waiting for you! Not only will you gain valuable insights and knowledge, but you'll also have the chance to compete for enticing weekly rewards. However, keep in mind that these rewards must be earned by competing with other participants! 🏆
----
-
-# Participage in Data Farming Challenges (Red Belt)
-
-<figure><img src="../.gitbook/assets/rewards/gif/eat-data.gif" alt=""><figcaption><p>Let's consume some data.</p></figcaption></figure>
-
-## **Get extra rewards by competing in data challenges!**
-
-If you're eager to consume data and create valuable assets for publishing but unsure of where to begin, fear not! We've got you covered.
-
-Data Farming offers rewards to data scientists who participate in weekly challenges.
-We provide the rules and rewards, allowing you to focus on delivering high-quality results. With challenges taking place on a weekly basis, there's always an opportunity for you to join in, so you're never too late to get started.
-
-### **What are the base rules?**
-
-- A fresh challenge begins and concludes every week.
-- At the beginning of each week, a predetermined amount of OCEAN tokens is allocated as rewards.
-- The rewards are divided into specific amounts for the top three positions.
-- The individuals who submit the top three entries will receive rewards, and their names will be showcased within the Data Farming dapp.
-
-### **What do I gain from this?**
-
-- Earn OCEAN rewards.
-- Gain in-depth knowledge of the Ocean Protocol stack.
-- Increase your visibility by achieving a place on the podium.
-- Create valuable assets that can be monetized on the Ocean Marketplace.
-- Enhance your skills and engage in friendly competition with other participants.
-
-### **Where to start?**
-
-Head over to the [Data Farming dapp](https://df.oceandao.org/rewards) and explore the new **Challenge DF substream** section, which is now part of the Active Rewards. The dapp itself will serve as your guide moving forward!
-
-If you're looking for a step-by-step guide on everything from understanding what a challenge entails to claiming your well-deserved rewards, be sure to check out [how to farm challenge df rewards](/user-guides/how-to-farm-challengedf.md) section. It will provide you with all the necessary information you need to make the most out of the challenges.
-
-### **Good lock and happy coding!**
-
-<figure><img src="../.gitbook/assets/rewards/gif/winner.gif" alt=""><figcaption></figcaption></figure>

rewards/df-emissions-apys.md

@@ -1,7 +1,6 @@
 ---
 description: >-
-  Hey there champ! If you can explain the emission curves and 
+  Hey there champ! If you can explain the emission curves and teach how to calculate APYs, then you've mastered Data Farming
-  teach how to calculate APYs, then you've mastered Data Farming
 ---
 
 # Emissions & APYs
@@ -57,3 +56,21 @@ All the plots are calculated from [this Google Sheet](https://docs.google.com/sp
 OCEAN lock time affects APY. The numbers above assume that all locked OCEAN is locked for 4 years, so that 1 OCEAN → 1 veOCEAN. But APY could be much worse or more if you lock for shorter durations. Here are approximate bounds.
 
 If you lock for 4 years, and everyone else locks for 2, then multiply expected APY by 2. If you lock for 4 years and others for 1, then multiply by 4. Conversely, if you lock for 2 years and everyone else for 4, then divide your expected APY by 2. If you lock for 1 year and others for 4, then divide by 4. The numbers assume that you’re actively allocating veOCEAN allocation towards high-DCV data assets. For passive locking or low-DCV data assets, divide APY by 2 (approximate).
+
+## A Brief History of Data Farming
+
+Data Farming has evolved over time and will continue to do so as the Emission Curve progresses. Below are the phases and parameters incurred during the evolution of the Data Farming program. We are now in the DF Main phase.
+
+**DF Alpha - Rounds 1-4 (4 wks)**\
+10K OCEAN rewards were budgeted per week. Counting started Thu June 16, 2022 and ended July 13, 2022. Rewards were distributed at the end of every week, for the activity of the previous week. It ran for 4 weeks. The aim was to test technology, learn, and onboard data publishers.
+
+**DF/VE Alpha - Rounds 5-8 (4 wks)**\
+10K OCEAN rewards were budgeted per week. Counting started Thu Sep 29, 2022 and ended Oct 27, 2022. Rewards were distributed at the end of every week, for the activity of the previous week. It ran for 4 weeks. The aim was to resume Data Farming along with veOCEAN, test the technology, onboard data publishers, and keep learning.
+
+**DF Beta - Rounds 9-28 (20 wks)**\
+Up to 100K OCEAN rewards were budgeted per week. Counting started Thu Oct 27, 2022, and ended on March 15, 2023. It ran for 20 weeks. The aim was to test the effect of larger incentives, and support ecosystem participation, while continually refining the underlying technology.
+
+**DF Main - Rounds 29-1000+**\
+We are now in DF Main which immediately followed the release of DF Beta on Thu Mar 16, 2023. Rewards begin at 150k per week and goes up to 1.1M OCEAN per week. DF Main emits 503.4M OCEAN worth of rewards and lasts for decades.
+
+The amount of OCEAN released is determined by the emission schedule as defined by the [Emission Curve](df-emissions-apys.md#emissions--first-5-years), and perhaps more easily understood in the [Reward Schedule](df-intro.md#reward-schedule).

rewards/df-guides.md

@@ -0,0 +1,39 @@
+---
+description: Show you can complete all User-Guides as the last steps to master Data Farming!
+---
+
+# Complete User Guides
+
+<figure><img src="../.gitbook/assets/gif/neo-kinda-martial-arts.gif" alt=""><figcaption><p>Like Neo, you have great potential.</p></figcaption></figure>
+
+### Get Started
+
+Our [User Guides](../user-guides/data-farming/README.md) get you started on Data Farming quickly so you can complete all operations. Follow these guides to get a complete handle on all Data Farming activities.
+
+{% content-ref url="../user-guides/data-farming/how-to-veocean.md" %}
+[data-farming/how-to-veocean.md](../user-guides/data-farming/how-to-veocean.md)
+{% endcontent-ref %}
+
+{% content-ref url="../user-guides/data-farming/how-to-estimate-apy.md" %}
+[../user-guides/data-farming/how-to-data-farm-volumedf.md](../user-guides/data-farming/how-to-estimate-apy.md)
+{% endcontent-ref %}
+
+{% content-ref url="../user-guides/data-farming/how-to-claim-rewards.md" %}
+[../user-guides/data-farming/how-to-claim-rewards.md](../user-guides/data-farming/how-to-claim-rewards.md)
+{% endcontent-ref %}
+
+{% content-ref url="../user-guides/data-farming/how-to-volumedf.md" %}
+[../user-guides/data-farming/how-to-volumedf.md](../user-guides/data-farming/how-to-volumedf.md)
+{% endcontent-ref %}
+
+{% content-ref url="../user-guides/data-farming/how-to-delegate.md" %}
+[../user-guides/data-farming/how-to-delegate.md](../user-guides/data-farming/how-to-delegate.md)
+{% endcontent-ref %}
+
+{% content-ref url="../user-guides/data-farming/how-to-challengedf.md" %}
+[../user-guides/data-farming/how-to-challengedf.md](../user-guides/data-farming/how-to-challengedf.md)
+{% endcontent-ref %}
+
+### Not much of a reader? Watch and learn, friend
+
+{% embed url="https://youtu.be/zAQlPHkK3og" %}

rewards/df-intro.md

@@ -6,74 +6,78 @@ description: Learn the fundamentals of The Way of Data Farming 🧑‍🏫
 
 <figure><img src="../.gitbook/assets/gif/morpheus.gif" alt=""><figcaption><p>Meet your sensei.</p></figcaption></figure>
 
-## What is Data Farming?
+## Weekly Rounds
 
-Data Farming (DF) is Ocean Protocol's **incentive system that rewards participants for creating value in the Ocean ecosystem.** 
+All streams and substreams repeat on a weekly basis that start on Thursdays 00:00 at UTC and end on Wed at 23:59 UTC.  
-
-Participants are able to **receive rewards passively, actively, or both** weekly by engaging in a variety of streams that helps the protocol grow. These activities include holding veOCEAN, curating datasets and building prediction models.
 
 ### Passive and Active Reward streams
 
-Every week OCEAN rewards are paid out to Data Farmers through two different reward streams. **Passive Rewards** and **Active Rewards**.  
+OCEAN rewards are paid out at the end of each week to Data Farmers through two different reward streams. **Passive Rewards** and **Active Rewards**.  
 
 These two reward streams produce different variable APYs.  
 
+Rewards are paid out at the end of each round.
+
 #### Splitting the Pie
 
-Each Data Farming weekly round has a pool of OCEAN rewards, where 50% of the pool is paid out in the form of passive rewards & 50% in the form of active rewards.
+Each Data Farming round has a pool of OCEAN rewards, where 50% of the pool is paid out in the form of passive rewards & 50% in the form of active rewards that [can be viewed here](https://df.oceandao.org/rewards).
 
 | Passive Rewards | Active Rewards |
 | --------------- | -------------- |
 | 50%             | 50%            |
 
-#### What are Passive Rewards?
-
-Passive rewards are the OCEAN rewards paid to Data Farmers just for locking their OCEAN tokens.
-
-<figure><img src="../.gitbook/assets/gif/passive-income.gif" alt=""><figcaption></figcaption></figure>
-
-[To start getting passive rewards, go here.](../user-guides/data-farming/how-to-farm-veOCEAN.md)
-
-#### What are Active Rewards and Substreams?
-
-Active Rewards are OCEAN rewards paid to contributors actively working to improve Ocean Protocol.  
-
-There are are two substreams available in Active Rewards:
-1. Volume DF
-2. Challenge DF
-
-Volume DF rewards Data Farmers that allocate their veOCEAN tokens to Ocean ecosystem assets. It's called Volume DF because the amount of rewards relies on assets that are actively generating Data Consume Volume. Therefore, **Volume DF yields depend on the sales produced by these assets and allocations made.** No sales = no rewards, so choose your favorite datasets wisely & then allocate. Always DYOR.
-
-Challenge DF rewards Data Scientists that produce prediction models that consistently improve the prediction of the price of Ethereum. It's called Challenge DF because weekly rewards are dispensed towards participants that are competing to improve the accuracy of how well we can predict price movements of Ethereum. Therefore, **Challenge DF yields depend on participants accurately outcompeting each other.** Only the top 3 predictions on the leaderboard win.
-
-Active Rewards are governed and defined by the [Reward Function](df-max-out-yield.md#reward-schedule).
-
-[To start getting Active Rewards, go here.](../user-guides/README.md)
-
-#### Estimating APY
-
-Each Data Farming weekly round has a pool of OCEAN rewards and [can be viewed here](https://df.oceandao.org/rewards)
 
 <figure><img src="../.gitbook/assets/rewards/df-reward-streams.png" alt=""><figcaption><p>Rewards Page overview for each stream.</p></figcaption></figure>
 
-##### Reward Streams
+### What are Passive Rewards?
 
-50% of the pool is paid out in the form of **Passive Rewards**.  
+Passive rewards are the OCEAN rewards paid to Data Farmers just for locking their OCEAN tokens.  
-50% of the pool is paid out in the form of **Active Rewards**.  
 
-| Passive Rewards | Active Rewards |
+veOCEAN holders can generate yield completely passively if they wish, though they are incentivized with larger real yield if they **actively participate** in farming yield from assets, or completing predictionc hallenges.  
-| --------------- | -------------- |
-| 50%             | 50%            |
 
-##### Reward Sub-Streams
+<figure><img src="../.gitbook/assets/gif/passive-income.gif" alt=""><figcaption></figcaption></figure>
-**Active Rewards** is then composed of two sub-streams.
 
+[To start getting passive rewards, go here.](../user-guides/data-farming/how-to-veocean.md)
+
+### What are Active Rewards?
+
+Active Rewards are OCEAN rewards paid to contributors actively working to improve Ocean Protocol.  
+
+**Active Rewards** is then composed of two sub-streams:
 1. 5,000 OCEAN is paid out to Challenge DF.
-2. The remainder is paid out to Volume DF.  
+2. 70,000 OCEAN remainder is paid out to Volume DF.  
 
 | Challenge DF | Volume DF |
 | --------------- | -------------- |
-| 5,000 OCEAN     | Remaining OCEAN    |
+| 5,000 OCEAN     | 70,000 OCEAN    |
+
+### What is Volume DF
+
+[Volume DF](df-volumedf.md#allocating-veocean) rewards Data Farmers that allocate their veOCEAN tokens to Ocean datasets. It's called Volume DF because the amount of rewards relies on assets that are actively generating Data Consume Volume.  
+
+You can visit the follow tutorial learn how to [access Volume DF](../user-guides/data-farming/how-to-volumedf.md).  
+
+Volume DF rewards are governed and defined by the [Reward Function](df-intro.md#reward-schedule).  
+
+#### Estimating APY
+
+To a get a good sense for how much APY you'll make, we recommend you understand the details of [how veOCEAN works](df-veocean.md). This will give you a basis for the calculations and provide you with an outline for what to expect in terms of rewards over time.  
+
+You can find the [how to estimate APY](../user-guides/data-farming/how-to-estimate-apy.md) user guide, calculate a reward schedule, and compare your lock up period with others.  
+
+#### Publisher Rewards
+
+<figure><img src="../.gitbook/assets/gif/just-publish.gif" alt=""><figcaption><p>Publishing lets you earn *more* OCEAN rewards</p></figcaption></figure>
+
+Publishers are strongly incentivized to launch assets in the Ocean Ecosystem. When publishers curate and support their own assets, they [receive double the allocation power](df-volumedf.md#what-are-publisher-rewards).  
+
+You can learn how to curate datasets and access [Publisher Rewards](../user-guides/data-farming/how-to-volumedf.md#) here.  
+
+### What is Challenge DF
+
+Challenge DF rewards Data Scientists that produce prediction models that consistently improve the prediction of the price of Ethereum. It's called Challenge DF because weekly rewards are dispensed towards participants that are competing to improve the accuracy of how well we can predict price movements of Ethereum. Therefore, **Challenge DF yields depend on participants accurately outcompeting each other.** Only the top 3 predictions on the leaderboard win.  
+
+You can visit the follow tutorial learn how to [access Challenge DF](../user-guides/data-farming/how-to-challengedf.md).  
 
 ### What's the difference between Data Farming and Yield Farming?
 
@@ -83,16 +87,14 @@ Unlike yield farming in DeFi, data farming has real intrinsic utility for Ocean
 
 To deepen this incentive, Publishers are boosted further and **gain 2x the allocation power** when pointing to their own assets.
 
-### What are Publisher Rewards?
+## Reward Schedule
 
-<figure><img src="../.gitbook/assets/gif/just-publish.gif" alt=""><figcaption><p>Publishing lets you earn *more* OCEAN rewards</p></figcaption></figure>
+The table below shows the total amount of OCEAN rewards that will be distributed among Passive and Active rewards each week. The table cross-references DF Round Number, Start Date, Phase & Week, Sub-Phase & Week, and OCEAN Rewards/Week.
 
-Data Farming strongly incentivizes publishing assets in the Ocean ecosystem by doubling the allocation power of Data Farmers that support their own published assets.
+<figure><img src="../.gitbook/assets/rewards/reward_schedule.png" alt=""><figcaption><p><em>Ocean Reward Schedule for the next 20+ years</em></p></figcaption></figure>
 
-How is it calculated? _All the veOCEAN a Data Farmer has allocated to an asset they’ve published **is effectively doubled for the rewards calculation.**_
+<figure><img src="../.gitbook/assets/gif/cash-flow.gif" alt=""><figcaption></figcaption></figure>
-
-You can read more about the implementation [in this blog post](https://blog.oceanprotocol.com/data-farming-publisher-rewards-f2639525e508).
 
 ## [GET STARTED DATA FARMING HERE.](https://df.oceandao.org)
 
-### Unsure how? Our [guides](../user-guides/README.md) will show you how to do the basics.
+### Unsure how? Our [guides](../user-guides/README.md) will show you how to do the basics.

rewards/df-veocean.md

@@ -15,7 +15,7 @@ You see, when you acquire veOCEAN via locking your OCEAN tokens in our Data Farm
 
 When you allocate to assets that sell, then **you get a portion of the sales**!
 
-You can do this all from the Data Farming dApp [Farms page](https://df.oceandao.org/farms).
+You can do this all from the Data Farming dApp [Farms page](https://df.oceandao.org/datafarming).
 
 ### The Superpowers of veOCEAN
 
@@ -28,20 +28,6 @@ veOCEAN allows you to engage with different Ocean Protocol mechanisms and benefi
 3. **Delegating it** You can delegate veOCEAN to other Data Farmers who can curate Datasets for you. In return for their services, these farmers may charge you a fee for helping you receive APY on **Active Rewards**. The Delegate feature has just been recently released and enables veOCEAN holders to more easily manage Active Rewards.
 4. **2x Publisher Stake** If you are a publisher in the Ocean ecosystem, then allocating your veOCEAN to your own asset gives your veOCEAN **a 2x Bonus**. This is an incentive for publishers to engage with their assets and benefit the assets in the Ocean ecosystem further.
 
-### The Nitty Gritty of **Passive & Active Rewards**
-
-#### Passive Rewards from Data Farming
-
-veOCEAN holders get weekly Data Farming rewards with a small carveout for any Ocean Protocol Data Challenges that run through Data Farming operations.
-
-#### Active Rewards from Community Fees
-
-veOCEAN holders can generate yield completely passively if they wish, though they are incentivized with larger real yield if they **actively participate** in farming yield from assets.
-
-Active rewards follow the usual Data Farming formula: $ of sales of the asset \* allocation to that asset.
-
-There is no liquidity locked inside a datatoken pool, and this allocation is safe: you can’t lose your OCEAN as it is merely locked.
-
 ### veOCEAN Time Locking
 
 Users can lock their OCEAN for different lengths of time to gain more veOCEAN **voting power**. The Data Farming dApp is designed to lock OCEAN for **a minimum of 2 weeks and a maximum of four years** (for max rewards). The longer you lock your OCEAN, the more veOCEAN + OCEAN rewards you get!
@@ -61,8 +47,6 @@ After choosing your lock period and locking up your OCEAN into the vault, you wi
 
 veOCEAN is non-transferable. You can’t sell it or send it to other addresses.
 
-_To help you more easily understand this, we have created [a couple of examples](../user-guides/how-to-df-estimate-apy.md) so you can more easily visualize the impact of your decisions on your overall yields._
-
 ### Linear Decay
 
 Your veOCEAN balance will slowly start declining as soon as you receive it.
@@ -84,25 +68,39 @@ At the end of your 4 years, your OCEAN is unlocked.
 
 The veOCEAN code is a fork of Curve's battle tested [veCRV](https://curve.readthedocs.io/dao-vecrv.html) token code.
 
+# veOCEAN and your APY
+
+Here are some good mental models to improve the outcome of your APY.
+1. The longer you lock, the more you'll earn.
+2. To improve yield, you will need to make good decisions for how long you'll choose to lock. The best way to do this is to learn how [Time Locking](#veocean-time-locking) and [Linear Decay](#linear-decay) function.
+2. APYs are always calculated by dividing the amount of OCEAN received from rewards, by the relative amount of OCEAN locked up.
+3. As a rule: _wherever APYs are provided to the user in the app (df.oceandao.org), they are caclulated assuming an initial 4-year lock up period with a weekly schedule of compounding rewards into an updated 4-year lock. This estimate works provided current: number of users, reward emissions, and other reward parameters stay constant while excluding all tx fees._
+
+To help you more easily understand APYs, we have provided a couple of examples in the [how to estimate APY](../user-guides/data-farming/how-to-estimate-apy.md) user guide so you can visualize different setups and their relative yields.
+
 ### Replenishing your veOCEAN
 
-You can choose to update your lock and replenish your veOCEAN balance at any time.
+To achieve optimal APY, participants would need to update their 4-year lock while considering costs and other variables to maintain an optimal amount of veOCEAN over time.
 
-To maximize rewards, participants would need to update their 4-year lock every week in order to maintain their veOCEAN balance as high as possible.
+Participants are also able to add more OCEAN to their vault when updating an existing vault.
+
+At any time, participants can choose to update their lock and continue from where they are or increase their lock duration.
 
 ### veOCEAN Earnings
 
-All earnings for veOCEAN holders are claimable in the Ethereum mainnet. (Data assets for DFing may be published in any network where Ocean’s deployed in production: ETH Mainnet, Polygon, etc.)
+All earnings for veOCEAN holders are claimable in the Ethereum mainnet.  
 
-Data Farming rounds occur weekly; in line with this, there’s a new [`ve`](https://github.com/oceanprotocol/df-py/tree/main/contracts/ve) distribution “epoch” every week. This affects when you can first claim rewards. Specifically, if you lock OCEAN on day x, you’ll be able to claim rewards on the first ve epoch that begins after day x+7. Put another way, from the time you lock OCEAN, you must wait at least a week, and up to two weeks, to be able to claim rewards. (This behavior is inherited from veCRV. Here’s the [code](https://github.com/oceanprotocol/df-py/tree/main/contracts/ve) )
+To be eligible for Data Farming Data assets for DFing may be published in any network where Ocean’s deployed in production: ETH Mainnet, Polygon, etc.)
 
-### DYOR!
+Data Farming rounds occur weekly; in line with this, there’s a new [`ve`](https://github.com/oceanprotocol/df-py/tree/main/contracts/ve) distribution “epoch” every week. This affects when you can first claim rewards. Specifically, if you lock OCEAN on day x, you’ll be able to claim rewards on the first ve epoch that begins after day x+7.  
+
+Put another way, from the time you lock OCEAN, you must wait at least a week, and up to two weeks, to be able to claim rewards. (This behavior is inherited from veCRV. Here’s the [code](https://github.com/oceanprotocol/df-py/tree/main/contracts/ve)).  
+
+### Locks & Withdrawal
 
 veOCEAN is architected to be locked (i.e. 'staked') for a certain period of time and cannot be transferred or sold during the lock time that is determined by each user.
 
-So it's important to **NOTE:** that you will not be able to retrieve your locked OCEAN tokens until the Lock End Date you selected on the dApp!
+So it's important to note that: **"you will not be able to retrieve your locked OCEAN tokens until the Lock End Date you selected on the dApp!**
-
-### Withdrawal
 
 After the Lock End Date, then you can withdraw your principal OCEAN tokens on the [veOCEAN page](https://df.oceandao.org/veocean) on the left side panel.
 

rewards/df-volumedf.md

@@ -1,28 +1,32 @@
 ---
 description: >-
-  If you've gotten this far, then you're half way to becoming a pro in
+  If you've gotten this far, then you're half way to becoming a pro in Ocean Protocol's Data Farming dApp!
-  Ocean Protocol's Data Farming dApp!
 ---
 
-# Mastering Volume DF (Purple Belt)
+# Curate Data in Volume DF
 
 <figure><img src="../.gitbook/assets/gif/i-know-kung-fu.gif" alt=""><figcaption><p>You know enough to be dangerous.</p></figcaption></figure>
 
-## Yield Kung Fu
+## What is Volume DF
 
-If you only lock your OCEAN tokens to get passive yield, then you're leaving money on the table. 
+If you obtain veOCEAN to only get passive yield, then you're leaving money on the table.  
 
-Data Farming rewards farmers that allocate their veOCEAN tokens to assets that **generate revenue** in the Ocean ecosystem. (No revenue, no rewards.) In addition, Data Farming incentivizes **publishing** assets in the Ocean ecosystem too - you get **2x the Allocation Power** when you allocate to an asset that you publish!
+Volume DF rewards Data Farmers that allocate their veOCEAN tokens to Ocean ecosystem assets.  
+
+It's called Volume DF because the amount of rewards relies on assets that are actively generating Data Consume Volume. Therefore, **Volume DF yields depend on the sales produced by these assets and allocations made.**  
+
+## Crops of Data
+
+Data Farming rewards farmers that allocate their veOCEAN tokens to assets that **generate revenue** in the Ocean ecosystem. (no revenue, no rewards) In addition, Data Farming incentivizes **publishing** assets in the Ocean ecosystem too - you get **2x the Allocation Power** when you allocate to an asset that you publish!
 
 Thus, if you really want to max out Volume DF APY:
-
 1. Lock your OCEAN for 4 years to receive 100% voting power.
-2. Have other participants delegate their Allocation Power to you.
+1. Have other participants delegate their Allocation Power to you.
-3. Create & publish assets (and make $ in selling them) — or work with people who can.
+1. Create & publish assets (and make $ in selling them) — or work with people who can.
-4. Point your Allocation Power towards your published assets to receive a 2x bonus.
+1. Point your Allocation Power towards your published assets to receive a 2x bonus.
-5. Claim weekly Passive Rewards, Active Rewards, and update your lock.
+1. Claim weekly Passive Rewards, Active Rewards, and update your lock.
 
-### Data Farming success metrics
+### Success Metrics
 
 **Data Consume Volume (DCV)** is our term for **the total $ amount spent on purchases of Ocean ecosystem assets**, transaction fees, and more. The higher DCV of Ocean ecosystem assets, then the more OCEAN rewards are distributed to Data Farmers. It's that simple!
 
@@ -32,9 +36,17 @@ Marketing your assets to buyers can be a big challenge. Just because you publish
 
 <figure><img src="../.gitbook/assets/gif/hustlin.gif" alt=""><figcaption></figcaption></figure>
 
-### Don't have time to publish your own datasets?
+## Delegating Voting Power
 
-Another way to improve your yield is by [delegating](../user-guides/README.md#how-to-delegate-your-active-rewards) your veOCEAN to someone to generate Active Rewards for you! In this case, the idea is that they may do a better job at publishing assets or picking winners better than you can. However, there is some risk to this because the rewards generated will be sent to the person you delegated to, and it's their responsibility to return those rewards back to you if that's the agreement you both made. To read more, see our [info on Delegation](../user-guides/README.md#how-to-delegate-your-active-rewards).
+Another way to improve your yield is by delegating to your veOCEAN to someone else that can generate Active Rewards for you! In this case, they may do a better job at publishing assets, curating winners, and have more market insights than you.
+
+Another scenario is a user with multiple wallets that wants to manage Volume DF from a single wallet.
+
+The Data Farming dApp [Delegate Page](https://df.oceandao.org/delegate) lets you easily manage delegations. Please keep in mind that the app assigns 100% of the current veOCEAN and the LockEnd time to set the delegation
+
+Whatever your scenario, there may be some risk to delegating because the rewards generated will be sent to the person you delegated to. **It's their responsibility to return those rewards back to you if that's the agreement you both made.**
+
+The guide on [how to Delegate](../user-guides/data-farming/how-to-delegate.md) shows how to provide another wallet with 100% of your allocation power.
 
 ### How Rewards are Calculated
 
@@ -43,7 +55,8 @@ The Reward Function (RF) governs how active rewards are allocated to Data Farmer
 **Rewards are calculated as follows:**
 
 1. Distribute OCEAN across each asset **based on rank**: highest-DCV asset gets the most OCEAN, etc.
-2. For each asset and each veOCEAN holder: If the holder is a publisher, 2x the effective allocation – Baseline rewards = (% allocation in asset) \* (OCEAN for an asset) – Bound rewards to the asset by 125% APY – Bound rewards by asset’s DCV \* 0.1%.
+1. For each asset and each veOCEAN holder: If the holder is a publisher, 2x the effective allocation – Baseline rewards = (% allocation in asset) \* (OCEAN for an asset) – Bound rewards to the asset by 125% APY – Bound rewards by asset’s DCV \* 0.1%.
+1. When DF restarts each Thursday, the global allocation towards each asset resets back to zero and then starts counting up again until the end of the round. After allocating your veOCEAN to different datasets, it will take time for your voting power to be accounted for. 
 
 For mathematicians and coders, you can find this code inside [calcrewards.py](https://github.com/oceanprotocol/df-py/blob/main/df_py/volume/calc_rewards.py) in the Ocean Protocol [df-py repo](https://github.com/oceanprotocol/df-py/)!
 
@@ -51,7 +64,7 @@ For mathematicians and coders, you can find this code inside [calcrewards.py](ht
 
 <figure><img src="../.gitbook/assets/gif/just-publish.gif" alt=""><figcaption><p>Publishing makes you *more* OCEAN rewards</p></figcaption></figure>
 
-Data Farming strongly incentivizes publishing assets in the Ocean ecosystem by giving double the active rewards to Data Farmers that allocate to their own published assets.
+Volume DF strongly incentivizes publishing assets in the Ocean ecosystem by giving double the active rewards to Data Farmers that allocate to their own published assets.
 
 How is it calculated? _All the veOCEAN a Data Farmer has allocated to an asset they’ve published is **doubled for the rewards calculation.**_
 
@@ -82,29 +95,3 @@ To qualify for DF, an asset must also:
 * Have been created by Ocean Smart contracts [deployed](https://github.com/oceanprotocol/contracts/blob/v4main/addresses/address.json) by OPF to [production networks](../discover/networks/README.md)
 * The asset must be listed on Ocean Market
 * Can’t be in [purgatory](https://github.com/oceanprotocol/list-purgatory/blob/main/policies/README.md)
-
-### Reward Schedule
-
-The table below shows the total amount of OCEAN rewards that will be distributed among Passive and Active rewards each week. The table cross-references DF Round Number, Start Date, Phase & Week, Sub-Phase & Week, and OCEAN Rewards/Week.
-
-<figure><img src="../.gitbook/assets/rewards/reward_schedule.png" alt=""><figcaption><p><em>Ocean Reward Schedule for the next 20+ years</em></p></figcaption></figure>
-
-<figure><img src="../.gitbook/assets/gif/cash-flow.gif" alt=""><figcaption></figcaption></figure>
-
-### A Brief History of Data Farming
-
-Data Farming has evolved over time and will continue to do so as the Emission Curve progresses. Below are the phases and parameters incurred during the evolution of the Data Farming program. We are now in the DF Main phase.
-
-**DF Alpha - Rounds 1-4 (4 wks)**\
-10K OCEAN rewards were budgeted per week. Counting started Thu June 16, 2022 and ended July 13, 2022. Rewards were distributed at the end of every week, for the activity of the previous week. It ran for 4 weeks. The aim was to test technology, learn, and onboard data publishers.
-
-**DF/VE Alpha - Rounds 5-8 (4 wks)**\
-10K OCEAN rewards were budgeted per week. Counting started Thu Sep 29, 2022 and ended Oct 27, 2022. Rewards were distributed at the end of every week, for the activity of the previous week. It ran for 4 weeks. The aim was to resume Data Farming along with veOCEAN, test the technology, onboard data publishers, and keep learning.
-
-**DF Beta - Rounds 9-28 (20 wks)**\
-Up to 100K OCEAN rewards were budgeted per week. Counting started Thu Oct 27, 2022, and ended on March 15, 2023. It ran for 20 weeks. The aim was to test the effect of larger incentives, and support ecosystem participation, while continually refining the underlying technology.
-
-**DF Main - Rounds 29-1000+**\
-We are now in DF Main which immediately followed the release of DF Beta on Thu Mar 16, 2023. Rewards begin at 150k per week and goes up to 1.1M OCEAN per week. DF Main emits 503.4M OCEAN worth of rewards and lasts for decades.
-
-The amount of OCEAN released is determined by the emission schedule as defined by the [Emission Curve](df-emissions-apys.md#emissions--first-5-years), and perhaps more easily understood in the Reward Schedule below.

user-guides/README.md

@@ -38,32 +38,32 @@ Buy, mint, and sell NFTs using the Ocean Market following the guides below.
 
 Earn rewards by obtaining veOCEAN, farm yield by curating datasets, and optimize your APY by publishing Data & Algorithm NFTs on-chain. ⛓️
 
-{% content-ref url="data-farming-101.md" %}
+{% content-ref url="data-farming/README.md" %}
-[data-farming-101.md](data-farming/data-farming-101.md)
+[data-farming/README.md](data-farming/README.md)
 {% endcontent-ref %}
 
-{% content-ref url="how-to-farm-veOCEAN.md" %}
+{% content-ref url="data-farming/how-to-veocean.md" %}
-[how-to-farm-veOCEAN.md](data-farming/how-to-farm-veOCEAN.md)
+[data-farming/how-to-veocean.md](data-farming/how-to-veocean.md)
 {% endcontent-ref %}
 
-{% content-ref url="how-to-df-estimate-apy.md" %}
+{% content-ref url="data-farming/how-to-estimate-apy.md" %}
-[how-to-df-estimate-apy.md](how-to-df-estimate-apy.md)
+[data-farming/how-to-data-farm-volumedf.md](data-farming/how-to-estimate-apy.md)
 {% endcontent-ref %}
 
-{% content-ref url="how-to-farm-claim-rewards.md" %}
+{% content-ref url="data-farming/how-to-claim-rewards.md" %}
-[how-to-farm-claim-rewards.md](data-farming/how-to-farm-claim-rewards.md)
+[data-farming/how-to-claim-rewards.md](data-farming/how-to-claim-rewards.md)
 {% endcontent-ref %}
 
-{% content-ref url="how-to-farm-volumedf.md" %}
+{% content-ref url="data-farming/how-to-volumedf.md" %}
-[how-to-farm-volumedf.md](data-farming/how-to-farm-volumedf.md)
+[data-farming/how-to-volumedf.md](data-farming/how-to-volumedf.md)
 {% endcontent-ref %}
 
-{% content-ref url="how-to-farm-delegate.md" %}
+{% content-ref url="data-farming/how-to-delegate.md" %}
-[how-to-farm-delegate.md](data-farming/how-to-farm-delegate.md)
+[data-farming/how-to-delegate.md](data-farming/how-to-delegate.md)
 {% endcontent-ref %}
 
-{% content-ref url="how-to-farm-challengedf.md" %}
+{% content-ref url="data-farming/how-to-challengedf.md" %}
-[how-to-farm-challengedf.md](data-farming/how-to-farm-challengedf.md)
+[data-farming/how-to-challengedf.md](data-farming/how-to-challengedf.md)
 {% endcontent-ref %}
 
 ### Antique Stuff 🏺

user-guides/data-farming/README.md

@@ -0,0 +1,49 @@
+---
+description: Learn the ins-and-outs Data Farming
+---
+
+# Data Farming Guides
+
+<figure><img src="../../.gitbook/assets/gif/farming.gif" alt=""><figcaption></figcaption></figure>
+
+Data Farming is the core incentive system inside of Ocean Protocol. It offers different ways for participants to help the protocol grow and succeed.
+
+It's broken down into 2 reward streams:
+1. Passive Rewards
+2. Active Rewards
+
+As the name suggests, users need to do very little to earn Passive Rewards and the program is aimed to onboard as many people as possible to help drive liquidity and conviction into the protocol.
+
+Active Rewards is an evolving incentive program that offers different venues for contributors to complete active work that drives the protocol forward.
+
+Anyone is welcomed to participate.
+
+## Passive Rewards stream
+
+The primary objective of the [Passive Rewards](../../rewards/df-intro.md#what-are-passive-rewards) stream is to provide an accessible way for anyone to use OCEAN and help the protocol grow.
+
+In [the veOCEAN user guide](user-guides/data-farming/how-to-farm-veOCEAN.md), you'll learn more about the Passive Rewards stream and how to get veOCEAN.
+
+## Active Rewards stream & Substreams
+
+The primary objective of [Active Rewards](../../rewards/df-intro.md#what-are-active-rewards) and substreams is to provide participants that engage with Data Farming different opportunities to create value. This approach allows users with different skills and interests to collaborate and contribute their unique abilities towards achieving the core values of Ocean Protocol.  
+
+Let's review the Active Reward substreams and get you started. 
+
+### Volume DF Substream
+
+The bread and butter of the Data Farming incentive program is [Volume DF](../../rewards/df-volumedf.md). Here publishers and curators that help maintain quality assets in the Ocean ecosystem are rewarded.  
+
+You can receive OCEAN rewards by allocating veOCEAN voting power to high-quality datasets and assisting Ocean with the curation of Data assets. Through this allocation, you will also receive a portion of the revenue generated by the dataset consumption.
+
+Allocation power can also be increased via delegation. The Data Farming dApp [Delegate Page](https://df.oceandao.org/delegate) lets you easily manage delegations.
+
+For more information on how to get started and detailed instructions, please refer to the [Volume DF user guide](how-to-farm-volumedf.md) section.
+
+### Challenge DF Substream
+
+If you are a data scientist and enjoy tackling challenging problems, this is the perfect place for you. [Challenge DF](../../rewards/df-challengedf.md) provides a competition where you can test your skills in predicting the price of Ethereum. Earn a place on the podium to receive a reward.
+
+This opportunity allows you to explore the capabilities offered by Ocean Protocol to build algorithms, publish data assets, and to gain valuable exposure. As your models and skills improve, you can begin monetizing your work.
+
+For detailed instructions and information on how to get started, please refer to the [Challenge DF user guide](how-to-farm-challengedf.md).

user-guides/data-farming/data-farming-101.md

@@ -1,61 +0,0 @@
----
-description: Make extra dosh with active rewards yield in Data Farming
----
-
-# Data Farm 101
-
-<figure><img src="../../.gitbook/assets/gif/farming.gif" alt=""><figcaption></figcaption></figure>
-
-Data Farming is the core incentive system inside of Ocean Protocol. It offers different ways for participants to help the protocol grow and succeed.
-
-It's broken down into 2 reward streams:
-1. Passive Rewards
-2. Active Rewards
-
-As the name suggests, users need to do very little to earn Passive Rewards and the program is aimed to onboard as many people as possible to help drive liquidity and conviction into the protocol.
-
-Active Rewards is an evolving incentive program that offers different venues for contributors to curate markets, create algorithms, and active do work to imporve the protocol.
-
-All streams operate permissionlessly and anyone is welcomed to participate.
-
-## Passive Rewards stream
-
-Passive Rewards is the first of the main streams within Data Farming.
-
-Passive Rewards offers a defined amount of rewards for each round that is divided amongst veOCEAN holders based on how much they hold.
-
-The primary objective of the Passive Rewards stream is to provide a low-friction, high-accessibility way for anyone that is holding OCEAN to participate and help the protocol grow.
-
-It is by-design, without the need for anyone to put in any significant effort. You simply need to lock your tokens for a period of time.
-
-To learn more about veOCEAN and the Passive Rewards stream [you can click here](user-guides/data-farming/how-to-farm-veOCEAN.md)
-
-## Active Rewards stream & substreams
-
-Active Rewards is the second of the main streams within Data Farming.
-
-Active Rewards offers a defined amount of rewards for each round and is further divided into multiple substreams.
-
-The primary objective of these substreams is to provide users with various opportunities to actively engage in Data Farming. This approach allows users with different skills and interests to collaborate and contribute their unique abilities towards achieving the core values of Ocean Protocol.
-
-Let's review the Active Reward substreams now to learn more about them, and help you get started with contributing to Ocean Protocol and earning rewards.
-
-### Volume DF Substream
-
-Volume DF is the bread and butter of the Data Farming incentive program and rewards OCEAN to publishers and curators that help maintain quality assets in the Ocean ecosystem.  
-
-If you have locked your OCEAN tokens in exchange for veOCEAN, this is the ideal opportunity for you to utilize those veOCEAN tokens and earn a portion of active rewards in addition to passive rewards.
-
-By allocating your veOCEAN power to high-quality datasets, you can assist Ocean in curating datasets. Moreover, through allocation, you will also receive a portion of the revenue generated by the dataset consumption.
-
-Allocation Power can also be earned via delegation. The Data Farming dApp [Delegate Page](https://df.oceandao.org/delegate) lets you easily manage simple delegations that use the 100% of the current veOCEAN and the LockEnd time to set the delegation.
-
-For more information on how to get started and detailed instructions, please refer to the [Volume DF](how-to-farm-volumedf.md) section.
-
-### Challenge DF Substream
-
-If you are a data scientist and enjoy tackling challenging problems, this is the perfect place for you. Challenge DF provides a weekly competition where you can test your skills in predicting the price of Ethereum. Rise against other participants to earn a place on the podium and receive a share of the available rewards.
-
-This opportunity allows you to explore the capabilities offered by Ocean Protocol and gain valuable exposure. As your models and skills improve, you can publish your models on the main network and begin monetizing your work.
-
-For detailed instructions and information on how to get started, please refer to the [Challenge DF](how-to-farm-challengedf.md) section.

user-guides/data-farming/how-to-challengedf.md

@@ -1,16 +1,14 @@
 ---
-description: Make extra dosh with active rewards yield in Data Farming
+description: Make extra dosh with building prediction models
 ---
 
-# Harvest More Yield in Challenge DF
+# How to Challenge DF
 
 <figure><img src="../../.gitbook/assets/rewards/gif/challenge-df.gif" alt=""></figure>
 
-## **Get More Rewards from Challenge DF**
+## Predict to earn
 
-The core focus of the Data Farming dApp lies in incentivizing OCEAN rewards for the curation and publication of valuable assets within the Ocean ecosystem.
+If you're eager to begin extracting value from data but aren't sure how to get started, then [Challenge DF is here to help](../../rewards/df-challengedf.md)!
-
-If you're eager to begin extracting value from data but aren't sure how to get started, then Challenge DF is here to help!
 
 By participating in the weekly data challenges of predicting the price of Ethereum, you will become familiar with the Ocean Protocol stack and with building predictions that can be sold for money.
 
@@ -24,11 +22,11 @@ Go to https://df.oceandao.org
 
 After the dApp loads, look for the menu and click on "Challenges"
 
-<figure><img src="../../.gitbook/assets/rewards/volumeDF-page.png" alt=""><figcaption><p>Find "Challenges" in the menu and click on it</p></figcaption></figure>
+<figure><img src="../../.gitbook/assets/rewards/challenge-page.png" alt=""><figcaption><p>Find "Challenges" in the menu and click on it</p></figcaption></figure>
 
 #### Step 3 - Click on "Participate"
 
-After clicking on "Participate" you will be linked to a README that outlines all details about the challenge.
+After clicking on "Participate" you will be [linked to the Challenge DF README](https://github.com/oceanprotocol/predict-eth/blob/main/challenges/challenge-df.md) that outlines all details about the challenge.
 
 <figure><img src="../../.gitbook/assets/rewards/challenge-active.png" alt=""><figcaption><p>Click the Participate button</p></figcaption></figure>
 
@@ -38,7 +36,7 @@ You can see the ongoing challenge right away together with some key informations
 
 Follow the README steps to publish your model and compete in the challenge.
 
-<figure><img src="../../.gitbook/assets/rewards/challenge-df-readme.png" alt=""><figcaption><p>How to submit ChallengeDF</p></figcaption></figure>
+<figure><img src="../../.gitbook/assets/rewards/challenge-df-readme.png" alt=""><figcaption><p>How to submit Challenge DF</p></figcaption></figure>
 
 #### Step 5 - Check weekly results
 
@@ -56,4 +54,7 @@ To view and claim your rewards:
 2. Your Challenge DF substream rewards will be displayed to the left besides "rewards". As you can see, it will be added to other active rewards that can be claimed besides "total rewards".
 3. To claim all Active Rewards including your Challenge DF rewards, simply click on the "Claim Rewards" button.
 
-<figure><img src="../../.gitbook/assets/rewards/challenge-substream.png" alt=""><figcaption><p>Click the Claim Rewards button</p></figcaption></figure>
+<figure><img src="../../.gitbook/assets/rewards/challenge-substream.png" alt=""><figcaption><p>Click the Claim Rewards button</p></figcaption></figure>
+
+
+

user-guides/data-farming/how-to-claim-rewards.md

@@ -8,7 +8,7 @@ description: How to claim OCEAN token rewards from data farming 🧑‍🌾🥕
 
 Ocean Protocol's Data Farming dapp dispenses rewards **every Thursday** to its participants. 💰 To claim your OCEAN token rewards for data farming, simply navigate to the Data Farming [Rewards page](https://df.oceandao.org/activerewards) and click the Claim OCEAN rewards buttons that will appear pink and clickable each Thursday. Yeehaw!
 
-Want to begin [data farming](https://df.oceandao.org)? Start [here](how-to-farm-veOCEAN.md). 🤠
+Want to begin [data farming](https://df.oceandao.org)? Start [here](how-to-veocean.md). 🤠
 
 ### Step 1 - Navigate to the Data Farming Rewards page
 

user-guides/data-farming/how-to-estimate-apy.md

@@ -0,0 +1,39 @@
+---
+description: >-
+  Learn how to use basic math and a simple spreadsheet to estimate your
+  Passive Rewards APY and get deeper into Active Rewards APY.
+---
+
+<figure><img src="../../.gitbook/assets/gif/mafs.gif" alt=""><figcaption><p>K.I.S.S.</p></figcaption></figure>
+
+# veOCEAN and your APY
+
+Rewards are earned by users that hold and use their veOCEAN to help the protocol improve and grow.  
+
+First, make sure that you [understand the basics of APY](../../rewards/df-veocean.md#veocean-and-your-apy) and how veOCEAN works.
+
+Now that we got that out of the way, let's work through the examples and keep it as simple as possible.
+
+### Estimating Passive APY
+
+To make it easier to estimate your APY, [we have created a simple spreadsheet](https://docs.google.com/spreadsheets/d/1zzuW5pBbX6j6hZL_XtJDtSR2-rDHa_LGOEwgoQ4D8lk/edit?usp=sharing) that let's you easily estimate your Passive APY.
+
+We have provided 2 sheets as an example of locking-up 10,000 OCEAN for:
+1. A 4-year investment period
+2. A 6-mo investment period
+
+The above are simplified examples meant for everyone to understand. They are naive investment strategies and are meant to provide you, the reader, with some examples to build upon. You can use these as a reference to create your own plan, so feel free to make a copy of this spreadsheet and customize it to your needs and wants.
+
+### Estimating Active APY
+
+Active Rewards are a bit more complicated and depend on many factors that are currently hard to predict accurately. It is unlikely for the user to get a practical result, which is why we don't offer a tool to estimate Active APY right now.
+
+You can easily expand the spreadsheet above to support a basic, naive calculations for Active Rewards such as adding a fixed-rate.
+
+To help solve this challenge, [we built a dashboard](https://df.oceandao.org/datafarming) that shows historical and ongoing summaries of APY, Data Consume Volume, and veOCEAN allocations per-round.
+
+<figure><img src="../../.gitbook/assets/rewards/curate-datasets.png" alt=""><figcaption><p>Curate like a Pro.</p></figcaption></figure>
+
+You can also [learn how rewards are calculated here](../rewards/df-volumedf.md.md#how-rewards-are-calculated) to understand more about what's happening behind the scenes of each Data Farming round.
+
+Finally, you can [review the implementation inside df-web](https://github.com/oceanprotocol/df-web/blob/main/src/utils/rewards.js) to understand how the APYs on the UI are calculated.

user-guides/data-farming/how-to-veocean.md

@@ -2,25 +2,19 @@
 description: Get veOCEAN tokens to use the Data Farming dApp and make yield! 🧑‍🌾🥕
 ---
 
-# Earn Passive Rewards with veOCEAN
-
-### What is Data Farming?
-
-[Data Farming](https://df.oceandao.org) is our dApp that generates yield for participants that curate and publish valuable assets in the Ocean ecosystem.
-
 <figure><img src="../../.gitbook/assets/gif/super-mario-coins.gif" alt="" width="250"><figcaption><p>Get veOCEAN tokens</p></figcaption></figure>
 
-### **What is veOCEAN and why do you want it? 🌊**
+# What is veOCEAN and Passive Rewards
 
 In order to **gain yield Data Farming**, you will need to lock your OCEAN tokens first! When you lock your OCEAN tokens, you get **veOCEAN tokens** and **weekly passive OCEAN rewards** in return. veOCEAN is a token used in Ocean Protocol's Data Farming dApp to **generate even more yield,** called **Volume DF rewards**, for allocating your veOCEAN tokens to your favorite assets and get a portion of their sales!
 
-### **Don't have OCEAN tokens yet? Get those first!**
+### Don't have OCEAN tokens yet? Get those first!
 
-#### **Step 1 - Get OCEAN tokens**
+#### Step 1 - Get OCEAN tokens
 
-- Acquire $OCEAN via a decentralized exchange (DEX) such as Uniswap or a centralized exchange (CEX) such as Binance, Coinbase, etc.
+- Acquire OCEAN via a decentralized exchange (DEX) such as Uniswap or a centralized exchange (CEX) such as Binance, Coinbase, etc.
 
-#### **Step 2 - Send to your self-custody wallet**
+#### Step 2 - Send to your self-custody wallet
 
 - Send your OCEAN tokens to a self-custody wallet of yours that supports ERC-20 tokens, like Metamask for example.
 
@@ -32,11 +26,11 @@ Not much of a reader? Watch and learn, friend
 Watch and learn, friend
 {% endembed %}
 
-#### **Step 3 - Go to Ocean Protocol's Data Farming dApp**
+#### Step 3 - Go to Ocean Protocol's Data Farming dApp
 
 - Go to [https://df.oceandao.org/](https://df.oceandao.org/)
 
-#### **Step 4 - Connect Your Wallet + Lock your OCEAN for veOCEAN**
+#### Step 4 - Connect Your Wallet + Lock your OCEAN for veOCEAN
 
 - Click on the purple circles in our interactive demo to walk through the steps for locking your OCEAN tokens for veOCEAN tokens.
 
@@ -53,4 +47,4 @@ In this step you will:
 - Click the “Create Lock” button.
 - Accept the transaction in your wallet.
 
-Congratulations! You have now locked your OCEAN tokens for veOCEAN tokens and are generating passive yield automatically. You can [claim your passive OCEAN rewards](how-to-farm-claim-rewards.md) every Thursday - note that your first time claiming rewards will require at least one week, but not more than 2 weeks of wait!
+Congratulations! You have now locked your OCEAN tokens for veOCEAN tokens and are generating passive yield automatically. You can [claim your passive OCEAN rewards](how-to-claim-rewards.md) every Thursday - note that your first time claiming rewards will require at least one week, but not more than 2 weeks of wait!

user-guides/data-farming/how-to-volumedf.md

@@ -1,16 +1,20 @@
 ---
-description: Make extra dosh with active rewards yield in Data Farming
+description: Make extra dosh by curating datasets in Data Farming
 ---
 
-# Harvest More Yield in Volume DF
+# How to Volume DF
 
 <figure><img src="../../.gitbook/assets/rewards/gif/volume-df.gif" alt=""><figcaption></figcaption></figure>
 
-## Get More Rewards from Volume DF
+## Curate to earn
 
 The bread and butter of the Data Farming dApp is incentivizing OCEAN rewards for curating and publishing valuable assets in the Ocean ecosystem. 
 
-The way that users curate assets is by **pointing their Allocation Power** to them using the Data Farming dApp. We'll show you how!
+The way that users curate assets is by **pointing their Allocation Power** to them using the Data Farming dApp.  
+
+If you're a publisher, then you can also benefit from additional bonuses.  
+
+We'll show you how!  
 
 #### Step 1 - Navigate to the Data Farming dApp
 
@@ -20,14 +24,15 @@ The way that users curate assets is by **pointing their Allocation Power** to th
 
 - Connect your wallet to the Data Farming dApp using the Ethereum network (mainnet)
 
-#### Step 3 - Click on the VolumeDF tab in the top menu
+#### Step 3 - Click on the Volume DF tab in the top menu
 
-<figure><img src="../../.gitbook/assets/rewards/volumeDF-page.png" alt=""><figcaption><p>Click the VolumeDF page link in the menu</p></figcaption></figure>
+<figure><img src="../../.gitbook/assets/rewards/volumeDF-page.png" alt=""><figcaption><p>Click the Volume DF page link in the menu</p></figcaption></figure>
 
 #### Step 4 - Select the assets which you would like to allocate to by toggling the percentage allocation at the end of the row
 
 - On the rightmost column, toggle the percentage of your total Allocation Power that you wish to allocate to each asset of your choice. You will **get a portion of the sales** of each asset that you allocate to!
-- Note that if you allocate to an asset that YOU published, then you will get an **effective 2x allocation boost**. The rows for assets that you publish will appear cream-colored.
+- Note that if you allocate to an asset that YOU published, then you will get an **effective 2x allocation boost**.
+- If you are a publisher and curating your own asset, your asset may be styled differently in the UI.
 
 <figure><img src="../../.gitbook/assets/rewards/allocations.png" alt=""><figcaption><p>Toggle the percentage of your veOCEAN that you would like to allocate to each asset</p></figcaption></figure>
 
@@ -38,4 +43,4 @@ The way that users curate assets is by **pointing their Allocation Power** to th
 
 <figure><img src="../../.gitbook/assets/rewards/update-allocations.png" alt=""><figcaption><p>Click the Update Allocations button</p></figcaption></figure>
 
-That's it! You've successfully allocated (aka "voted on") your favorite assets in the Ocean ecosystem using your veOCEAN tokens and are generating active rewards yield. Now, just wait until next Thursday to see if you can [claim any OCEAN rewards](how-to-farm-claim-rewards.md) on the Active Rewards section of the [Rewards page](https://df.oceandao.org/rewards) for your portion of the assets' sales. Remember that your first time claiming rewards will require at least one week, but not more than 2 weeks of wait!
+That's it! You've successfully allocated (aka "voted on") your favorite assets in the Ocean ecosystem using your veOCEAN tokens and are generating active rewards yield. Now, just wait until next Thursday to see if you can [claim any OCEAN rewards](how-to-claim-rewards.md) on the Active Rewards section of the [Rewards page](https://df.oceandao.org/rewards) for your portion of the assets' sales. Remember that your first time claiming rewards will require at least one week, but not more than 2 weeks of wait!

user-guides/how-to-df-estimate-apy.md

@@ -1,42 +0,0 @@
----
-description: >-
-  Learn how to use basic math and a simple spreadsheet to estimate your
-  Passive Rewards APY and get deeper into Active Rewards APY.
----
-
-<figure><img src="../.gitbook/assets/gif/mafs.gif" alt=""><figcaption><p>K.I.S.S.</p></figcaption></figure>
-
-# veOCEAN and your APY
-
-Before we start, let's do a quick recap.
-
-Rewards are earned by users that hold and use their veOCEAN to help the protocol improve and grow. Here are some good lessons to improve the outcome of your APY.
-1. To improve your yield, you will need to make good decisions for how long you'll choose to lock. The best way to do this is to learn how [Time Locking](/rewards/veocean.md#veocean-time-locking) and [Linear Decay](/rewards/veocean.md#linear-decay) function.
-2. APYs are always initially calculated by dividing the amount of OCEAN you have received from rewards, by the relative amount of OCEAN you have locked up.
-3. As a rule: _Wherever APYs are provided to the user in the app (df.oceandao.org), they are caclulated assuming an initial 4-year lock up period with a weekly schedule of compounding rewards into an updated 4-year lock. This estimate works provided current: number of users, reward emissions, and other reward parameters stay constant while excluding all tx fees._
-
-Now that we got that out of the way, let's work through the examples and keep it as simple as possible.
-
-### Estimating Passive APY
-
-To make it easier to estimate your APY, [we have created a simple spreadsheet](https://docs.google.com/spreadsheets/d/1zzuW5pBbX6j6hZL_XtJDtSR2-rDHa_LGOEwgoQ4D8lk/edit?usp=sharing) that let's you easily estimate your Passive APY.
-
-We have provided 2 sheets as an example of locking-up 10,000 OCEAN for:
-1. A 4-year investment period
-2. A 6-mo investment period
-
-The above are simplified examples meant for everyone to understand. They are naive investment strategies and are meant to provide you, the reader, with some examples to build upon. You can use these as a reference to create your own plan, so feel free to make a copy of this spreadsheet and customize it to your needs and wants.
-
-### Estimating Active APY
-
-Active Rewards are a bit more complicated and depend on many factors that are currently hard to predict accurately. It is unlikely for the user to get a practical result, which is why we don't offer a tool to estimate Active APY right now.
-
-You can easily expand the spreadsheet above to support basic, naive calculations for Active Rewards such as defining a constant percent yield per week.
-
-Having said this, we do provide a thorough dashboard that provides historical and ongoing summaries of APY, Data Consume Volume, and veOCEAN allocations per-round.
-
-<figure><img src="../.gitbook/assets/rewards/curate-datasets.png" alt=""><figcaption><p>Curate like a Pro.</p></figcaption></figure>
-
-You can also [learn how rewards are calculated here](../rewards/df-max-out-yield.md#how-rewards-are-calculated) to understand more about what's happening behind the scenes of each Data Farming round.
-
-Finally, you can [review the implementation inside df-web](https://github.com/oceanprotocol/df-web/blob/main/src/utils/rewards.js) to understand how APYs are calculated at the frontend/UI level.