Reviewed and Added more CR comments