latest sync with Miller's repository