Now compatible with normalized values