Add company
Merge fix