Finish getting it working with both old and new versions.