More and Amir

#1

Just wait for rate replacement