Processed review comments Yusuf