more changes based on review feedback