Implemented Rate function
Solved Merge conflict