adding boundaries and other updates based on product/design req