fixed non-raw rates, removed raw rates