update to latest from BradLarson