Update to latest scotthartbti