more review commnets fixed