changes based on review feedback