* incorporated review changes