Now added a switch which defaults to True