updated js option switch and option1+3