Added better company mode