Kelly, From my rather limited but frustrating experiences in this area it would seem that you are more or less on track. I don’t think that there are any hard and fast rules for this. We were unsure of the Developers toolkit but have found using it in combination with manual changes is working ok. (so far…) From what we have done, as Petursson has suggested, we have used the toolkit to merge only the changed base objects on the assumption that the new version base units will continue to function as the previous ones before them and so will just take the place of the unchanged old version base units. We have also found it easier to deal with each object type in turn (forms,reports etc) otherwise we have been missing errors/unwanted changes because of the volume of information present. I imagine you will also be forced to do some things manually such as form design because the toolkit doesn’t always get it right especially with things like main menu customisation. Basically its all a bit trial and error often with the emphasis on the latter. I hope this is some help!!