Improved spec after discussions with Magne.