Fixed kappa stuff following discussion.