updates and changes based on review feedback