major upgrade to include ds settings