review feedback from @ezequiel