fixed up company mode