Changed option switches slightly for robustness