diff --git a/AIPs/aip-5.md b/AIPs/aip-5.md
index bc7efb0..ba35c1c 100644
--- a/AIPs/aip-5.md
+++ b/AIPs/aip-5.md
@@ -1,212 +1,176 @@
---
aip: 5
-title: Sigmoid Rebasing Function
-author: Evan Kuo (@statuskuo), Ahmed Naguib Aly (@naguib)
+title: Sigmoid Rebase Function
+author: Ahmed Naguib Aly (https://github.com/ahnaguib)
discussions-to: https://github.com/ampleforth/AIPs/issues/16
-status: WIP
-created: 2020-10-13
+status: PROPOSED
+created: 2020-12-1
requires (*optional): N/A
---
+## Summary
-## Simple Summary
-
-The current Ampleforth rebasing function predisposes the network to short periods of rapid expansion and long periods of gradual contraction. This document proposes an update to the Ampleforth rebasing policy that would:
+This document proposes an update to the Ampleforth rebase policy that would limit the protocol's sensitivity to short-lived demand shocks.
-* Limit the protocol's sensitivity to short-lived demand shocks.
-* Create symmetry between supply expansion and contraction.
+This should make the Ampleforth protocol a more robust building block for decentralized finance.
-The two above considerations should make the Ampleforth protocol a more balanced and robust building block for decentralized finance.
## Abstract
-
-We propose to deploy a new contract that updates the current supply policy's linear rebasing function with a modified sigmoid-like rebasing function.
+
+The proposal is to deploy a new contract that updates the current supply policy's linear rebase function with a sigmoid (s-shaped) function.
+
## Motivation
-
-The original Ampleforth linear rebasing function was intended to make minimal assumptions about how price reacts to expansion and contraction (i.e. expansion would slow price increases by translating them into supply increases and contraction would slow price decreases by translating them into supply decreases). Said differently, the main purpose of the function is to point supply changes in the right direction without trying to predict the exact magnitude of supply change needed for the fastest reversion to the price target.
+The original Ampleforth linear rebase function was intended to make minimal assumptions about how price reacts to expansion and contraction--i.e. expansion would slow price increases by translating them into supply increases and contraction would slow price decreases by translating them into supply decreases. Hence the main purpose of the function is to point supply change in the right direction without trying to predict the magnitude of supply change needed for the fastest convergence to the price target.
-Now that we have observed a year’s worth of market history and analyzed the data, we can see that extreme market scenarios can have outsized effects on AMPL supply, which then require large and prolonged supply corrections. The goal of this change is to:
+Now that we have observed a year’s worth of market history and analyzed the data, we can see that extreme market scenarios can have outsized effects on AMPL supply, which then require prolonged supply corrections. The goal of this change is to:
-- Limit protocol sensitivity to short-lived, but extreme market conditions that can wildly expand or contract supply. Currently, the protocol already has a maximum contraction percentage, but a potentially unlimited expansion percentage.
-- Create symmetry between price signals to expand supply and signals to contract supply—e.g. a signal to double supply (price of $2), should be perfectly offset by a signal to halve supply (price of $0.5). This is currently not the case, as explained below.
-These changes are expected to make AMPL more robust as a base money in decentralized finance applications. AMPL will keep its dynamic properties to change supply to match demand. In addition AMPL will be enhanced by protections against short-lived but extreme market conditions. The protocol is also expected to remain closer to its target, now that larger supply adjustments will happen closer to the target price.
+* Limit protocol sensitivity to short-lived, but extreme market conditions that can disproportionately change supply.
-### Motivation for Symmetry
+Additional side benefits from having a cap on daily supply changes:
-A supply policy is asymmetric if the magnitude of contraction is not equal to the magnitude of expansion, given identical but opposite changes in relative demand. In the case of Ampleforth, the protocol currently experiences much slower contraction than expansion. Consider the example of an alternating series below:
+* Having a bound that makes AMPL supply changes relatively more predictable beyond the current day.
+* Limit the potential effect from a bad oracle price. This makes AMPL more resilient to errors and attacks and also increases the feasibility of further oracle decentralization efforts.
+
+## Specification
-**_Alternating Series Example_**
+The smart contract upgrade replaces the current linear rebase function with a sigmoid curve that caps supply expansions at its asymptotes
-Consider a price series that alternates between $0.5 and $2, every 24hrs, infinitely:
-
+
-For fixed-supply assets, the `market_cap` in our example above simply alternates between two values. This makes sense as you would expect a doubling of demand to cancel out a halving of demand. However, for any `rebase_reaction_lag` value other than 1, the current Ampleforth supply policy will drift upwards over time, eventually calling for correction.
-### Motivation for Capped Expansion Rate
-
-Contraction occurs in the price range of [0,1] whereas expansion occurs in the range of [1,∞]. As a result, expansion can rapidly outpace contraction, requiring prolonged corrective periods. To this end, we also propose asymptotic limits on the rates of supply change, in order to reduce the protocol's sensitivity to short-lived, but extreme market conditions.
-
-## Specification
-
-
-### Overview
-
-The smart contract upgrade replaces the current linear rebasing function with a "balanced" sigmoid-shaped curve that horizontally asymptotes away from the price target.
+```
+Rebase factor of 1.0 means no rebase.
+Normalized price = VWAP price / Target price
-### Rationale
-
+note: x in the formula above is normalized price deviation and F(x) is the fraction of change
+while the diagram for better visual representation shows the normalized price on the x-axis and the supply multiplier factor on the y-axis
+```
-Below we'll quickly review the basic sigmoid, and then explain the rationale for the "balanced" sigmoid proposed.
+The proposed curve above is generated by the sigmoid function:
-#### 1. Sigmoid
-A sigmoid function takes the following shape, notice the horizontal asymptotes and the maximum slope at the target price($1):
-
+
-**1.1. _Sigmoid Function and Parameters_**
-
-This equation takes, `x`, the normalized difference between `VWAP` and the price target. It returns, `Y`, the corresponding supply change percentage.
```
-Y = supply change %
-x = normalized price deviation
+F(x) : fraction of supply added or removed (supply change %)
+x : normalized price deviation
```
-
-
-
It has shaping parameters that determine: lower asymptote, upper asymptote, and the steepness of the curve (ie: growth rate).
+
```
-L = lower asymptote
-U = upper asymptote
-B = growth rate
+l = lower asymptote
+u = upper asymptote
+g = growth rate
```
-#### 2. "Balanced" Sigmoid
+### Technical Specification
-Although the Sigmoid is a good start, we can improve upon it by transforming supply changes such that they “balance” one another. More specifically:
+This update creates no changes to external APIs. Clients, including exchanges, who listen to AMPL’s rebase events still receive the absolute supply change integer as before. However, note that any external application that calculates the delta independently will need to update their calculation logic.
-* If a demand-change-factor of `A` corresponds with supply-change-factor `B`.
-* We want to enforce that a demand-change-factor of `1/A` corresponds with a supply-change-factor of `1/B`.
-This way, supply reactions to equal and opposite relative changes in demand, always even each other out. For more context, see the alternating series example in the motivation section above.
+#### Parameter Values
-**2.1. _The "Balancing" Solution_**
+These parameters were set to achieve the outcomes stated above (see motivation)—while keeping the aggregate expansion rate as similar to the current protocol as possible.
-To create multiplicative symmetry let's begin by observing that:
-* For every scaling factor S, there exists an inverse scaling factor S-1 such that S * S-1 = 1
+The proposed values are:
-And let’s also observe that:
-* For every price P there exists an inverse price P-1 such that P * P-1 = 1
+```
+l (Lower) = -0.11
+u (Upper) = 0.11
+g (Growth) = 4
+```
-We can enforce the constraint of “balanced” supply-change-factors by computing contraction supply-change-factors as the inverse of expansion supply-change-factors. In other words:
-
+
-This way, for every price pair {P, P-1} the corresponding supply-change-factor pair {S, S-1} upholds the constraint that S * S-1 = 1.
+
+```
+Note that the upper asymptote approaches a scaling factor of 1.11 at a normalized price of $3.
+```
+
+To show that the proposed (sigmoid) expansion output is reasonably similar to the current (linear) output:
+
+1. Proposed and current supply policy functions were applied to historic VWAP data.
+2. Aggregate positive rebases were computed for proposed and current supply functions.
+3. The ratio between proposed and current aggregate positive rebases is computed
+
+**_Normalized VWAP distribution_**
+
-
+
-**2.2. _Balanced Sigmoid Equation and Parameters_**
+**_Proposed vs Current Rebase Totals_**
-Recall that the sigmoid supply change function accepts a price deviation and returns a supply change percentage. Combining it with the inversing function gives the output*:
-
+
-*_\* In the equation above, P denotes normalized price, P = vwap_price/target_*
+Based on the analysis above, the function parameters have a ratio of 1.055 between the aggregate rebases.
+
+### Test Cases
+
+Existing unit tests will be updated with the correct calculation results to maintain test coverage.
+
+
+### Conclusions
+
+This change is expected to make the ampleforth protocol more robust as a base money in decentralized finance applications.
+The Ampleforth protocol will maintain the same nature to change supply to match demand.
+In addition, it will be enhanced by protections against short-lived but extreme market conditions.
+
+
+
+
+
+
+
+
+
+
+
+
-#### 3. "Balanced" Sigmoid vs Linear
-We expect that the “balanced” sigmoid supply curve will cause the Ampleforth network to react symmetrically to relative demand signals, and eliminate the bias towards prolonged contraction periods.
-
-
-
-### Technical Specification
-
-This update creates no changes to external APIs. Clients, including exchanges, who listen to AMPL’s rebase events still receive the absolute supply change integer as before. However, note that any external application that calculates the delta independently will need to update their calculation logic.
-#### Initial Parameter Values
-These parameters were set to achieve the outcomes stated above (see motivation)—while keeping the aggregate expansion rate as similar to the current protocol as possible.
-Recall that the contraction curve is derived from the expansion curve through the "balancing" solution above. Thus, we need only verify that the shaping parameters selected, produce an expansion curve that generally resembles the current rebasing function. Based on this, a balanced contraction curve is constructed from the balanced_sigmoid equation as defined above.
-The proposed values are:
-```
-L (Lower) = -0.11
-U (Upper) = 0.11
-B (Growth) = 4
-```
-**_Shape Comparison_**
-Below we present a chart depicting the balanced_sigmoid_shape alongside the current linear policy with (L=-.11, U=.11, B=4).
-
-
-
-Here we can see that the:
-* The Upper asymptote approaches a scaling factor of 1.11 at a price of $3.
-* The Lower asymptote approaches a scaling factor of 0.9 at a price of $0.3
-
-Note that the difference in shape is more pronounced for contraction than for expansion.
-**_Verification_**
-To verify that the proposed (sigmoid) expansion output is reasonably similar to the current (linear) output:
-1. Proposed and current supply policy functions were applied to historic `VWAP` data.
-2. Aggregate positive rebases were computed for proposed and current supply functions.
-3. The ratio between proposed and current aggregate positive rebases is: **1.01**
-Based on our analysis above, the set function parameters meet the goal of having similar aggregate effect on expansion rebases. This AIP only includes the verification methodology and not how those parameters were generated. We look forward to releasing a deeper dive on this in a separate blog post.
-**_Normalized VWAP distribution_**
-
-
-
-**_Proposed vs Current Rebase Totals_**
-
-
-
-### Test Cases
-
-Existing unit tests will be updated with the correct calculation results to maintain test coverage
-## Copyright
-Copyright and related rights waived via [CC0](https://creativecommons.org/publicdomain/zero/1.0/).
diff --git a/assets/aip-5/ShapeComparison-2.png b/assets/aip-5/ShapeComparison-2.png
deleted file mode 100644
index a8a71ba..0000000
Binary files a/assets/aip-5/ShapeComparison-2.png and /dev/null differ
diff --git a/assets/aip-5/balanced_sigmoid_latex_thin.jpg b/assets/aip-5/balanced_sigmoid_latex_thin.jpg
deleted file mode 100644
index 27c2f09..0000000
Binary files a/assets/aip-5/balanced_sigmoid_latex_thin.jpg and /dev/null differ
diff --git a/assets/aip-5/balanced_sigmoid_latexchart.png b/assets/aip-5/balanced_sigmoid_latexchart.png
deleted file mode 100644
index 1a07f4a..0000000
Binary files a/assets/aip-5/balanced_sigmoid_latexchart.png and /dev/null differ
diff --git a/assets/aip-5/basic_sigmoid_chart.png b/assets/aip-5/basic_sigmoid_chart.png
deleted file mode 100644
index fa67fe1..0000000
Binary files a/assets/aip-5/basic_sigmoid_chart.png and /dev/null differ
diff --git a/assets/aip-5/basic_sigmoid_eq.png b/assets/aip-5/basic_sigmoid_eq.png
deleted file mode 100644
index 8f772e9..0000000
Binary files a/assets/aip-5/basic_sigmoid_eq.png and /dev/null differ
diff --git a/assets/aip-5/basic_sigmoid_eq_2.png b/assets/aip-5/basic_sigmoid_eq_2.png
deleted file mode 100644
index 8f772e9..0000000
Binary files a/assets/aip-5/basic_sigmoid_eq_2.png and /dev/null differ
diff --git a/assets/aip-5/basic_sigmoid_latex_thin.jpg b/assets/aip-5/basic_sigmoid_latex_thin.jpg
deleted file mode 100644
index 30159ef..0000000
Binary files a/assets/aip-5/basic_sigmoid_latex_thin.jpg and /dev/null differ
diff --git a/assets/aip-5/basic_sigmoid_latexchart.png b/assets/aip-5/basic_sigmoid_latexchart.png
deleted file mode 100644
index 7d3b9a8..0000000
Binary files a/assets/aip-5/basic_sigmoid_latexchart.png and /dev/null differ
diff --git a/assets/aip-5/basic_sigmoid_latexchart_2.png b/assets/aip-5/basic_sigmoid_latexchart_2.png
deleted file mode 100644
index ce7156a..0000000
Binary files a/assets/aip-5/basic_sigmoid_latexchart_2.png and /dev/null differ
diff --git a/assets/aip-5/basic_sigmoid_plot.png b/assets/aip-5/basic_sigmoid_plot.png
deleted file mode 100644
index 6559daf..0000000
Binary files a/assets/aip-5/basic_sigmoid_plot.png and /dev/null differ
diff --git a/assets/aip-5/combined_latex_thin.jpg b/assets/aip-5/combined_latex_thin.jpg
deleted file mode 100644
index 9994c0b..0000000
Binary files a/assets/aip-5/combined_latex_thin.jpg and /dev/null differ
diff --git a/assets/aip-5/combined_latexchart.png b/assets/aip-5/combined_latexchart.png
deleted file mode 100644
index 9c1115b..0000000
Binary files a/assets/aip-5/combined_latexchart.png and /dev/null differ
diff --git a/assets/aip-5/combined_latexchart_withdeviation.png b/assets/aip-5/combined_latexchart_withdeviation.png
deleted file mode 100644
index b70dc68..0000000
Binary files a/assets/aip-5/combined_latexchart_withdeviation.png and /dev/null differ
diff --git a/assets/aip-5/curves.png b/assets/aip-5/curves.png
new file mode 100644
index 0000000..d80ca51
Binary files /dev/null and b/assets/aip-5/curves.png differ
diff --git a/assets/aip-5/distribution-2.png b/assets/aip-5/distribution-2.png
deleted file mode 100644
index 660b516..0000000
Binary files a/assets/aip-5/distribution-2.png and /dev/null differ
diff --git a/assets/aip-5/distribution.png b/assets/aip-5/distribution.png
deleted file mode 100644
index c3708d1..0000000
Binary files a/assets/aip-5/distribution.png and /dev/null differ
diff --git a/assets/aip-5/formula.png b/assets/aip-5/formula.png
new file mode 100644
index 0000000..6378817
Binary files /dev/null and b/assets/aip-5/formula.png differ
diff --git a/assets/aip-5/mirrored_and_current_plot.png b/assets/aip-5/mirrored_and_current_plot.png
deleted file mode 100644
index 0471039..0000000
Binary files a/assets/aip-5/mirrored_and_current_plot.png and /dev/null differ
diff --git a/assets/aip-5/mirrored_sigmoid_chart.png b/assets/aip-5/mirrored_sigmoid_chart.png
deleted file mode 100644
index 279e527..0000000
Binary files a/assets/aip-5/mirrored_sigmoid_chart.png and /dev/null differ
diff --git a/assets/aip-5/mirrored_sigmoid_plot.png b/assets/aip-5/mirrored_sigmoid_plot.png
deleted file mode 100644
index a5ed3d4..0000000
Binary files a/assets/aip-5/mirrored_sigmoid_plot.png and /dev/null differ
diff --git a/assets/aip-5/piecewise_eq.png b/assets/aip-5/piecewise_eq.png
deleted file mode 100644
index c7ca551..0000000
Binary files a/assets/aip-5/piecewise_eq.png and /dev/null differ
diff --git a/assets/aip-5/piecewise_sigmoid_eq.png b/assets/aip-5/piecewise_sigmoid_eq.png
deleted file mode 100644
index c8cd61a..0000000
Binary files a/assets/aip-5/piecewise_sigmoid_eq.png and /dev/null differ
diff --git a/assets/aip-5/placeholder.txt b/assets/aip-5/placeholder.txt
deleted file mode 100644
index 9daeafb..0000000
--- a/assets/aip-5/placeholder.txt
+++ /dev/null
@@ -1 +0,0 @@
-test
diff --git a/assets/aip-5/price_distribution.png b/assets/aip-5/price_distribution.png
new file mode 100644
index 0000000..b9bfc9f
Binary files /dev/null and b/assets/aip-5/price_distribution.png differ
diff --git a/assets/aip-5/rebase_histogram.png b/assets/aip-5/rebase_histogram.png
new file mode 100644
index 0000000..56d92ea
Binary files /dev/null and b/assets/aip-5/rebase_histogram.png differ
diff --git a/assets/aip-5/series.png b/assets/aip-5/series.png
deleted file mode 100644
index 8128479..0000000
Binary files a/assets/aip-5/series.png and /dev/null differ
diff --git a/assets/aip-5/sideXside-2.png b/assets/aip-5/sideXside-2.png
deleted file mode 100644
index a527418..0000000
Binary files a/assets/aip-5/sideXside-2.png and /dev/null differ
diff --git a/assets/aip-5/sigmoid.png b/assets/aip-5/sigmoid.png
new file mode 100644
index 0000000..af20103
Binary files /dev/null and b/assets/aip-5/sigmoid.png differ