Fix after review. Update to latest empirical.