Added normalization and boundary inference