add ability to manualy set company"