Design for rate optimization

Completed