incorporating some review comments