Redo WGS84 version.