taking care of review comments