Continued with company setting features