updated for new company field