last update before main trunk edits