Added a switch for yes/no.