update -00 with unmerged copy
some work on merging in