review comments fixed