+ add iRate
- update code for new flow