update basing on review feedback