fixed missing company
simplified slightly