i use beyond compare and when copying old to new it is very easy, it actually highlights the different code so you can spot your hack, select it and send it over to the new code, it even inserts it where it should be automagically. It's my understanding that once all your hacks are copied over to the new code, you then upload the new code, and THEN you must run the upgrade script. But I am no expert so someone correct me if I'm wrong. I'll be upgrading today -shouldn't be too bad but not looking forward to it