Pre- alpha->rate refactor