Have an experience of upgrading code to newer Delphi including assembler inlines, Unicode issues, TStringStream behaviour changes and so on, well, I must say it is time-consuming and trial and error conversion (mainly due to Unicode strings and binary octet streams no longer being the same, and it is not always possible to change every string to AnsString). I'll try to consider previous experience, but leave deadline further away just in case.