企业版

Ensure seamless integration of the two halves