Review Comments Implementation