added in changes for the new switch options