updated based on review