Merge change 2765

* changes:
  Move stuff around in an attempt to make VFP faster.