Updated for company changes