Made it so that switches are not required.