sync with my local copy (this file may go away, eventually)