Comply to review comments