last update prior to merge with master