updates basing on review feedback