Added normalization and expectation value