This is Paul K's latest set of ld changes. A commit was necessary at this