Commit before chnging into different data structure.
Changed rates_mode - second is not working yet.