企业版

Fix errors without any awkwardness