Improved CompanyChange